diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index cdec7d2..35ce9df 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 const $route = useRoute()
@@ -21,22 +22,36 @@
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const ruleForm = ref({
+  equipmentList: [],
+  groupInfo: {
+    createTime: '',
+    createUserId: '',
+    createUserName: '',
+    groupName: '',
+    id: '',
+    updateTime: '',
+    remark: '',
+  },
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type === 'create') {
-    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createUserId = userStore.id
+    ruleForm.value.groupInfo.createUserName = userStore.name
   }
   else {
-    ruleForm.value = JSON.parse($route.query.row as string)
-    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
-    //   ruleForm.value = res.data
-    // })
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    detailGroup({ groupId: data.id }).then((res) => {
+      ruleForm.value = res.data
+    })
   }
 }
 onMounted(() => {
@@ -46,11 +61,12 @@
 const close = () => {
   $router.back()
 }
+const tableRef = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
-    if (valid) {
+    if (valid && tableRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -60,38 +76,23 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.attachments = tableRef.value.list
-        ruleForm.value.technicalTargetList = technologyRef.value.list
-        editInfo(ruleForm.value).then((res) => {
-          console.log(res.data, '123')
-          ElMessage.success('保存成功')
-          submitId.value = res.data
-        })
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          addGroup(ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          updateGroup(ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
       })
     }
   })
 }
-// 提交
-const submitForm = () => {
-  if (!submitId.value) {
-    ElMessage.warning('请先保存')
-    return false
-  }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
-      ElMessage.success('已提交')
-      close()
-    })
-  })
-}
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
@@ -113,35 +114,39 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm.groupInfo"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+      >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="分组名称">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model.trim="ruleForm.groupInfo.groupName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" />
+              <el-input v-model.trim="ruleForm.groupInfo.createUserName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" />
+              <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
-            <el-form-item label="备注">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.groupInfo.remark" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+      <table-list ref="tableRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
     </detail-block-com>
   </app-container>
 </template>

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index cdec7d2..35ce9df 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 const $route = useRoute()
@@ -21,22 +22,36 @@
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const ruleForm = ref({
+  equipmentList: [],
+  groupInfo: {
+    createTime: '',
+    createUserId: '',
+    createUserName: '',
+    groupName: '',
+    id: '',
+    updateTime: '',
+    remark: '',
+  },
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type === 'create') {
-    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createUserId = userStore.id
+    ruleForm.value.groupInfo.createUserName = userStore.name
   }
   else {
-    ruleForm.value = JSON.parse($route.query.row as string)
-    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
-    //   ruleForm.value = res.data
-    // })
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    detailGroup({ groupId: data.id }).then((res) => {
+      ruleForm.value = res.data
+    })
   }
 }
 onMounted(() => {
@@ -46,11 +61,12 @@
 const close = () => {
   $router.back()
 }
+const tableRef = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
-    if (valid) {
+    if (valid && tableRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -60,38 +76,23 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.attachments = tableRef.value.list
-        ruleForm.value.technicalTargetList = technologyRef.value.list
-        editInfo(ruleForm.value).then((res) => {
-          console.log(res.data, '123')
-          ElMessage.success('保存成功')
-          submitId.value = res.data
-        })
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          addGroup(ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          updateGroup(ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
       })
     }
   })
 }
-// 提交
-const submitForm = () => {
-  if (!submitId.value) {
-    ElMessage.warning('请先保存')
-    return false
-  }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
-      ElMessage.success('已提交')
-      close()
-    })
-  })
-}
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
@@ -113,35 +114,39 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm.groupInfo"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+      >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="分组名称">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model.trim="ruleForm.groupInfo.groupName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" />
+              <el-input v-model.trim="ruleForm.groupInfo.createUserName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" />
+              <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
-            <el-form-item label="备注">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.groupInfo.remark" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+      <table-list ref="tableRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index abba0f0..7514857 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getGroupList } from '@/api/eqpt/device/group'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   groupName: '',
@@ -41,33 +42,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getInfoListPage(listQuery, $props.statusName).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
-  total.value = 3
-  list.value = [
-    {
-      groupName: '分组1',
-      createUserName: '张三',
-      createTime: '2023-07-28 00:00:00',
-      remark: '这是备注1',
-    },
-    {
-      groupName: '分组2',
-      createUserName: '王五',
-      createTime: '2023-07-28 08:00:00',
-      remark: '这是备注2',
-    },
-    {
-      groupName: '分组3',
-      createUserName: '李四',
-      createTime: '2023-07-28 09:00:00',
-      remark: '这是备注3',
-    },
-  ]
+  getGroupList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index cdec7d2..35ce9df 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 const $route = useRoute()
@@ -21,22 +22,36 @@
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const ruleForm = ref({
+  equipmentList: [],
+  groupInfo: {
+    createTime: '',
+    createUserId: '',
+    createUserName: '',
+    groupName: '',
+    id: '',
+    updateTime: '',
+    remark: '',
+  },
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type === 'create') {
-    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createUserId = userStore.id
+    ruleForm.value.groupInfo.createUserName = userStore.name
   }
   else {
-    ruleForm.value = JSON.parse($route.query.row as string)
-    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
-    //   ruleForm.value = res.data
-    // })
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    detailGroup({ groupId: data.id }).then((res) => {
+      ruleForm.value = res.data
+    })
   }
 }
 onMounted(() => {
@@ -46,11 +61,12 @@
 const close = () => {
   $router.back()
 }
+const tableRef = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
-    if (valid) {
+    if (valid && tableRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -60,38 +76,23 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.attachments = tableRef.value.list
-        ruleForm.value.technicalTargetList = technologyRef.value.list
-        editInfo(ruleForm.value).then((res) => {
-          console.log(res.data, '123')
-          ElMessage.success('保存成功')
-          submitId.value = res.data
-        })
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          addGroup(ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          updateGroup(ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
       })
     }
   })
 }
-// 提交
-const submitForm = () => {
-  if (!submitId.value) {
-    ElMessage.warning('请先保存')
-    return false
-  }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
-      ElMessage.success('已提交')
-      close()
-    })
-  })
-}
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
@@ -113,35 +114,39 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm.groupInfo"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+      >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="分组名称">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model.trim="ruleForm.groupInfo.groupName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" />
+              <el-input v-model.trim="ruleForm.groupInfo.createUserName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" />
+              <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
-            <el-form-item label="备注">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.groupInfo.remark" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+      <table-list ref="tableRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index abba0f0..7514857 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getGroupList } from '@/api/eqpt/device/group'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   groupName: '',
@@ -41,33 +42,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getInfoListPage(listQuery, $props.statusName).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
-  total.value = 3
-  list.value = [
-    {
-      groupName: '分组1',
-      createUserName: '张三',
-      createTime: '2023-07-28 00:00:00',
-      remark: '这是备注1',
-    },
-    {
-      groupName: '分组2',
-      createUserName: '王五',
-      createTime: '2023-07-28 08:00:00',
-      remark: '这是备注2',
-    },
-    {
-      groupName: '分组3',
-      createUserName: '李四',
-      createTime: '2023-07-28 09:00:00',
-      remark: '这是备注3',
-    },
-  ]
+  getGroupList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 25c3ab6..fbfbcf1 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -1,6 +1,7 @@
 <!-- 设备分组 - 设备信息 -->
 <script lang="ts" setup name="EditPlatform">
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
@@ -16,43 +17,43 @@
 const columns = ref([
   {
     text: '统一编号',
-    value: 'name',
+    value: 'equipmentNo',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '设备名称',
-    value: 'information',
+    value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '型号规格',
-    value: 'location',
+    value: 'model',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '负责人',
-    value: 'location',
+    value: 'directorName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '计量标识',
-    value: 'location',
+    value: 'meterIdentify',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '证书有效期',
-    value: 'location',
+    value: 'certificateValid',
     required: true,
-    isSelect: false, // 是否下拉框
+    isSelect: true, // 是否下拉框
   },
   {
     text: '安装位置',
-    value: 'location',
+    value: 'installLocation',
     required: true,
     isSelect: false, // 是否下拉框
   },
@@ -60,17 +61,7 @@
 const list = ref([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '设备信息')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -97,9 +88,13 @@
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
-      name: '',
-      information: '',
-      location: '',
+      equipmentNo: '',
+      equipmentName: '',
+      model: '',
+      directorName: '',
+      meterIdentify: '',
+      certificateValid: '',
+      installLocation: '',
       editable: true,
     })
   }
@@ -114,9 +109,18 @@
   list.value = $props.data
   dialogStatus.value = $props.status
 }
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    console.log(newVal, 'newVal')
+    list.value = newVal
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 initDialog()
 defineExpose({
-  list,
+  list, checkCertificateList,
 })
 </script>
 
@@ -152,8 +156,10 @@
             v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           />
-          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+          <el-date-picker
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
+          />
         </template>
       </el-table-column>
     </el-table>

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index cdec7d2..35ce9df 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 const $route = useRoute()
@@ -21,22 +22,36 @@
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const ruleForm = ref({
+  equipmentList: [],
+  groupInfo: {
+    createTime: '',
+    createUserId: '',
+    createUserName: '',
+    groupName: '',
+    id: '',
+    updateTime: '',
+    remark: '',
+  },
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type === 'create') {
-    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createUserId = userStore.id
+    ruleForm.value.groupInfo.createUserName = userStore.name
   }
   else {
-    ruleForm.value = JSON.parse($route.query.row as string)
-    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
-    //   ruleForm.value = res.data
-    // })
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    detailGroup({ groupId: data.id }).then((res) => {
+      ruleForm.value = res.data
+    })
   }
 }
 onMounted(() => {
@@ -46,11 +61,12 @@
 const close = () => {
   $router.back()
 }
+const tableRef = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
-    if (valid) {
+    if (valid && tableRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -60,38 +76,23 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.attachments = tableRef.value.list
-        ruleForm.value.technicalTargetList = technologyRef.value.list
-        editInfo(ruleForm.value).then((res) => {
-          console.log(res.data, '123')
-          ElMessage.success('保存成功')
-          submitId.value = res.data
-        })
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          addGroup(ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          updateGroup(ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
       })
     }
   })
 }
-// 提交
-const submitForm = () => {
-  if (!submitId.value) {
-    ElMessage.warning('请先保存')
-    return false
-  }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
-      ElMessage.success('已提交')
-      close()
-    })
-  })
-}
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
@@ -113,35 +114,39 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm.groupInfo"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+      >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="分组名称">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model.trim="ruleForm.groupInfo.groupName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" />
+              <el-input v-model.trim="ruleForm.groupInfo.createUserName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" />
+              <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
-            <el-form-item label="备注">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.groupInfo.remark" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+      <table-list ref="tableRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index abba0f0..7514857 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getGroupList } from '@/api/eqpt/device/group'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   groupName: '',
@@ -41,33 +42,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getInfoListPage(listQuery, $props.statusName).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
-  total.value = 3
-  list.value = [
-    {
-      groupName: '分组1',
-      createUserName: '张三',
-      createTime: '2023-07-28 00:00:00',
-      remark: '这是备注1',
-    },
-    {
-      groupName: '分组2',
-      createUserName: '王五',
-      createTime: '2023-07-28 08:00:00',
-      remark: '这是备注2',
-    },
-    {
-      groupName: '分组3',
-      createUserName: '李四',
-      createTime: '2023-07-28 09:00:00',
-      remark: '这是备注3',
-    },
-  ]
+  getGroupList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 25c3ab6..fbfbcf1 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -1,6 +1,7 @@
 <!-- 设备分组 - 设备信息 -->
 <script lang="ts" setup name="EditPlatform">
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
@@ -16,43 +17,43 @@
 const columns = ref([
   {
     text: '统一编号',
-    value: 'name',
+    value: 'equipmentNo',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '设备名称',
-    value: 'information',
+    value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '型号规格',
-    value: 'location',
+    value: 'model',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '负责人',
-    value: 'location',
+    value: 'directorName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '计量标识',
-    value: 'location',
+    value: 'meterIdentify',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '证书有效期',
-    value: 'location',
+    value: 'certificateValid',
     required: true,
-    isSelect: false, // 是否下拉框
+    isSelect: true, // 是否下拉框
   },
   {
     text: '安装位置',
-    value: 'location',
+    value: 'installLocation',
     required: true,
     isSelect: false, // 是否下拉框
   },
@@ -60,17 +61,7 @@
 const list = ref([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '设备信息')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -97,9 +88,13 @@
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
-      name: '',
-      information: '',
-      location: '',
+      equipmentNo: '',
+      equipmentName: '',
+      model: '',
+      directorName: '',
+      meterIdentify: '',
+      certificateValid: '',
+      installLocation: '',
       editable: true,
     })
   }
@@ -114,9 +109,18 @@
   list.value = $props.data
   dialogStatus.value = $props.status
 }
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    console.log(newVal, 'newVal')
+    list.value = newVal
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 initDialog()
 defineExpose({
-  list,
+  list, checkCertificateList,
 })
 </script>
 
@@ -152,8 +156,10 @@
             v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           />
-          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+          <el-date-picker
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
+          />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
new file mode 100644
index 0000000..1dfa04b
--- /dev/null
+++ b/src/views/tested/device/info/components/detail.vue
@@ -0,0 +1,54 @@
+<!-- 证书到期提醒，详情 -->
+<script lang="ts" setup name="addNotice">
+import baseInfo from '@/views/tested/device/info/components/edit.vue'
+import reportTable from '@/views/tested/device/info/components/reportTable.vue'
+import statusTable from '@/views/tested/device/info/components/statusTable.vue'
+import roamTable from '@/views/tested/device/info/components/roamTable.vue'
+const activeName = ref('基本信息')
+const $router = useRouter()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page title="设备基本信息-详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-tabs v-model="activeName" type="card" class="demo-tabs">
+        <el-tab-pane label="基本信息" name="基本信息">
+          <base-info class="device-base-info" />
+        </el-tab-pane>
+        <el-tab-pane label="证书报告" name="证书报告">
+          <report-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="状态变更记录" name="状态变更记录">
+          <status-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="设备流转日志" name="设备流转日志">
+          <roam-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="审批详情" name="审批详情">
+          <!-- <roam-table :data="[]" status="detail" /> -->
+          审批详情
+        </el-tab-pane>
+      </el-tabs>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.device-base-info {
+  ::v-deep(.base-info-device) {
+    display: none;
+  }
+
+  // ::v-deep(.header) {
+  //   display: none;
+  // }
+}
+</style>

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index cdec7d2..35ce9df 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 const $route = useRoute()
@@ -21,22 +22,36 @@
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const ruleForm = ref({
+  equipmentList: [],
+  groupInfo: {
+    createTime: '',
+    createUserId: '',
+    createUserName: '',
+    groupName: '',
+    id: '',
+    updateTime: '',
+    remark: '',
+  },
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type === 'create') {
-    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createUserId = userStore.id
+    ruleForm.value.groupInfo.createUserName = userStore.name
   }
   else {
-    ruleForm.value = JSON.parse($route.query.row as string)
-    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
-    //   ruleForm.value = res.data
-    // })
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    detailGroup({ groupId: data.id }).then((res) => {
+      ruleForm.value = res.data
+    })
   }
 }
 onMounted(() => {
@@ -46,11 +61,12 @@
 const close = () => {
   $router.back()
 }
+const tableRef = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
-    if (valid) {
+    if (valid && tableRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -60,38 +76,23 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.attachments = tableRef.value.list
-        ruleForm.value.technicalTargetList = technologyRef.value.list
-        editInfo(ruleForm.value).then((res) => {
-          console.log(res.data, '123')
-          ElMessage.success('保存成功')
-          submitId.value = res.data
-        })
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          addGroup(ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          updateGroup(ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
       })
     }
   })
 }
-// 提交
-const submitForm = () => {
-  if (!submitId.value) {
-    ElMessage.warning('请先保存')
-    return false
-  }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
-      ElMessage.success('已提交')
-      close()
-    })
-  })
-}
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
@@ -113,35 +114,39 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm.groupInfo"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+      >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="分组名称">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model.trim="ruleForm.groupInfo.groupName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" />
+              <el-input v-model.trim="ruleForm.groupInfo.createUserName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" />
+              <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
-            <el-form-item label="备注">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.groupInfo.remark" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+      <table-list ref="tableRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index abba0f0..7514857 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getGroupList } from '@/api/eqpt/device/group'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   groupName: '',
@@ -41,33 +42,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getInfoListPage(listQuery, $props.statusName).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
-  total.value = 3
-  list.value = [
-    {
-      groupName: '分组1',
-      createUserName: '张三',
-      createTime: '2023-07-28 00:00:00',
-      remark: '这是备注1',
-    },
-    {
-      groupName: '分组2',
-      createUserName: '王五',
-      createTime: '2023-07-28 08:00:00',
-      remark: '这是备注2',
-    },
-    {
-      groupName: '分组3',
-      createUserName: '李四',
-      createTime: '2023-07-28 09:00:00',
-      remark: '这是备注3',
-    },
-  ]
+  getGroupList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 25c3ab6..fbfbcf1 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -1,6 +1,7 @@
 <!-- 设备分组 - 设备信息 -->
 <script lang="ts" setup name="EditPlatform">
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
@@ -16,43 +17,43 @@
 const columns = ref([
   {
     text: '统一编号',
-    value: 'name',
+    value: 'equipmentNo',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '设备名称',
-    value: 'information',
+    value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '型号规格',
-    value: 'location',
+    value: 'model',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '负责人',
-    value: 'location',
+    value: 'directorName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '计量标识',
-    value: 'location',
+    value: 'meterIdentify',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '证书有效期',
-    value: 'location',
+    value: 'certificateValid',
     required: true,
-    isSelect: false, // 是否下拉框
+    isSelect: true, // 是否下拉框
   },
   {
     text: '安装位置',
-    value: 'location',
+    value: 'installLocation',
     required: true,
     isSelect: false, // 是否下拉框
   },
@@ -60,17 +61,7 @@
 const list = ref([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '设备信息')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -97,9 +88,13 @@
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
-      name: '',
-      information: '',
-      location: '',
+      equipmentNo: '',
+      equipmentName: '',
+      model: '',
+      directorName: '',
+      meterIdentify: '',
+      certificateValid: '',
+      installLocation: '',
       editable: true,
     })
   }
@@ -114,9 +109,18 @@
   list.value = $props.data
   dialogStatus.value = $props.status
 }
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    console.log(newVal, 'newVal')
+    list.value = newVal
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 initDialog()
 defineExpose({
-  list,
+  list, checkCertificateList,
 })
 </script>
 
@@ -152,8 +156,10 @@
             v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           />
-          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+          <el-date-picker
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
+          />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
new file mode 100644
index 0000000..1dfa04b
--- /dev/null
+++ b/src/views/tested/device/info/components/detail.vue
@@ -0,0 +1,54 @@
+<!-- 证书到期提醒，详情 -->
+<script lang="ts" setup name="addNotice">
+import baseInfo from '@/views/tested/device/info/components/edit.vue'
+import reportTable from '@/views/tested/device/info/components/reportTable.vue'
+import statusTable from '@/views/tested/device/info/components/statusTable.vue'
+import roamTable from '@/views/tested/device/info/components/roamTable.vue'
+const activeName = ref('基本信息')
+const $router = useRouter()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page title="设备基本信息-详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-tabs v-model="activeName" type="card" class="demo-tabs">
+        <el-tab-pane label="基本信息" name="基本信息">
+          <base-info class="device-base-info" />
+        </el-tab-pane>
+        <el-tab-pane label="证书报告" name="证书报告">
+          <report-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="状态变更记录" name="状态变更记录">
+          <status-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="设备流转日志" name="设备流转日志">
+          <roam-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="审批详情" name="审批详情">
+          <!-- <roam-table :data="[]" status="detail" /> -->
+          审批详情
+        </el-tab-pane>
+      </el-tabs>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.device-base-info {
+  ::v-deep(.base-info-device) {
+    display: none;
+  }
+
+  // ::v-deep(.header) {
+  //   display: none;
+  // }
+}
+</style>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 9fa954e..b768fb5 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -7,6 +7,8 @@
 import technology from './technology.vue'
 import showPhoto from './showPhoto.vue'
 import { editBtn, submitBtn } from './applyBtns'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelInfo, deleteInfo, editInfo, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
@@ -113,6 +115,16 @@
   fetchInUse()
 }
 fetchSelectData()
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
@@ -131,6 +143,14 @@
     //   ruleForm.value = res.data
     // })
   }
+  if ($route.params.type === 'update' && statusName === '全部') {
+    ruleForm.value.approvalType = '2'
+    ruleForm.value.approvalTypeName = '编辑设备'
+    ruleForm.value.id = ''
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
 }
 onMounted(() => {
   initDialog()
@@ -245,7 +265,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: ruleForm.value.id }).then((res) => {
+    cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
       close()
     })
@@ -254,7 +274,7 @@
 // 审批
 const approvalDialogRef = ref()
 const apply = (type: string) => {
-  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId)
+  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId, ruleForm.value.processId, ruleForm.value.id)
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -269,6 +289,7 @@
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        console.log(ruleForm.value.instructionsFile, 'ruleForm.value.instructionsFile')
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
@@ -434,7 +455,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="使用部门">
-              <el-input v-model.trim="ruleForm.deptId" />
+              <!-- <el-input v-model.trim="ruleForm.deptId" /> -->
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -462,11 +484,11 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="附件" prop="instructionsFile">
               <show-photo :minio-file-name="ruleForm.instructionsFile" />
               <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
-              <el-button type="primary" @click="upload">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
                 上传
               </el-button>
             </el-form-item>
@@ -475,7 +497,7 @@
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定(校准)机构" prop="checkOrganization">
@@ -510,7 +532,7 @@
       <technology ref="technologyRef" :data="[]" :status="$route.params.type as string" />
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用岗位" prop="usePosition">

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index cdec7d2..35ce9df 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 const $route = useRoute()
@@ -21,22 +22,36 @@
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const ruleForm = ref({
+  equipmentList: [],
+  groupInfo: {
+    createTime: '',
+    createUserId: '',
+    createUserName: '',
+    groupName: '',
+    id: '',
+    updateTime: '',
+    remark: '',
+  },
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type === 'create') {
-    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createUserId = userStore.id
+    ruleForm.value.groupInfo.createUserName = userStore.name
   }
   else {
-    ruleForm.value = JSON.parse($route.query.row as string)
-    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
-    //   ruleForm.value = res.data
-    // })
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    detailGroup({ groupId: data.id }).then((res) => {
+      ruleForm.value = res.data
+    })
   }
 }
 onMounted(() => {
@@ -46,11 +61,12 @@
 const close = () => {
   $router.back()
 }
+const tableRef = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
-    if (valid) {
+    if (valid && tableRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -60,38 +76,23 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.attachments = tableRef.value.list
-        ruleForm.value.technicalTargetList = technologyRef.value.list
-        editInfo(ruleForm.value).then((res) => {
-          console.log(res.data, '123')
-          ElMessage.success('保存成功')
-          submitId.value = res.data
-        })
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          addGroup(ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          updateGroup(ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
       })
     }
   })
 }
-// 提交
-const submitForm = () => {
-  if (!submitId.value) {
-    ElMessage.warning('请先保存')
-    return false
-  }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
-      ElMessage.success('已提交')
-      close()
-    })
-  })
-}
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
@@ -113,35 +114,39 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm.groupInfo"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+      >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="分组名称">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model.trim="ruleForm.groupInfo.groupName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" />
+              <el-input v-model.trim="ruleForm.groupInfo.createUserName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" />
+              <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
-            <el-form-item label="备注">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.groupInfo.remark" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+      <table-list ref="tableRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index abba0f0..7514857 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getGroupList } from '@/api/eqpt/device/group'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   groupName: '',
@@ -41,33 +42,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getInfoListPage(listQuery, $props.statusName).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
-  total.value = 3
-  list.value = [
-    {
-      groupName: '分组1',
-      createUserName: '张三',
-      createTime: '2023-07-28 00:00:00',
-      remark: '这是备注1',
-    },
-    {
-      groupName: '分组2',
-      createUserName: '王五',
-      createTime: '2023-07-28 08:00:00',
-      remark: '这是备注2',
-    },
-    {
-      groupName: '分组3',
-      createUserName: '李四',
-      createTime: '2023-07-28 09:00:00',
-      remark: '这是备注3',
-    },
-  ]
+  getGroupList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 25c3ab6..fbfbcf1 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -1,6 +1,7 @@
 <!-- 设备分组 - 设备信息 -->
 <script lang="ts" setup name="EditPlatform">
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
@@ -16,43 +17,43 @@
 const columns = ref([
   {
     text: '统一编号',
-    value: 'name',
+    value: 'equipmentNo',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '设备名称',
-    value: 'information',
+    value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '型号规格',
-    value: 'location',
+    value: 'model',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '负责人',
-    value: 'location',
+    value: 'directorName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '计量标识',
-    value: 'location',
+    value: 'meterIdentify',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '证书有效期',
-    value: 'location',
+    value: 'certificateValid',
     required: true,
-    isSelect: false, // 是否下拉框
+    isSelect: true, // 是否下拉框
   },
   {
     text: '安装位置',
-    value: 'location',
+    value: 'installLocation',
     required: true,
     isSelect: false, // 是否下拉框
   },
@@ -60,17 +61,7 @@
 const list = ref([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '设备信息')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -97,9 +88,13 @@
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
-      name: '',
-      information: '',
-      location: '',
+      equipmentNo: '',
+      equipmentName: '',
+      model: '',
+      directorName: '',
+      meterIdentify: '',
+      certificateValid: '',
+      installLocation: '',
       editable: true,
     })
   }
@@ -114,9 +109,18 @@
   list.value = $props.data
   dialogStatus.value = $props.status
 }
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    console.log(newVal, 'newVal')
+    list.value = newVal
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 initDialog()
 defineExpose({
-  list,
+  list, checkCertificateList,
 })
 </script>
 
@@ -152,8 +156,10 @@
             v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           />
-          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+          <el-date-picker
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
+          />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
new file mode 100644
index 0000000..1dfa04b
--- /dev/null
+++ b/src/views/tested/device/info/components/detail.vue
@@ -0,0 +1,54 @@
+<!-- 证书到期提醒，详情 -->
+<script lang="ts" setup name="addNotice">
+import baseInfo from '@/views/tested/device/info/components/edit.vue'
+import reportTable from '@/views/tested/device/info/components/reportTable.vue'
+import statusTable from '@/views/tested/device/info/components/statusTable.vue'
+import roamTable from '@/views/tested/device/info/components/roamTable.vue'
+const activeName = ref('基本信息')
+const $router = useRouter()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page title="设备基本信息-详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-tabs v-model="activeName" type="card" class="demo-tabs">
+        <el-tab-pane label="基本信息" name="基本信息">
+          <base-info class="device-base-info" />
+        </el-tab-pane>
+        <el-tab-pane label="证书报告" name="证书报告">
+          <report-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="状态变更记录" name="状态变更记录">
+          <status-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="设备流转日志" name="设备流转日志">
+          <roam-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="审批详情" name="审批详情">
+          <!-- <roam-table :data="[]" status="detail" /> -->
+          审批详情
+        </el-tab-pane>
+      </el-tabs>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.device-base-info {
+  ::v-deep(.base-info-device) {
+    display: none;
+  }
+
+  // ::v-deep(.header) {
+  //   display: none;
+  // }
+}
+</style>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 9fa954e..b768fb5 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -7,6 +7,8 @@
 import technology from './technology.vue'
 import showPhoto from './showPhoto.vue'
 import { editBtn, submitBtn } from './applyBtns'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelInfo, deleteInfo, editInfo, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
@@ -113,6 +115,16 @@
   fetchInUse()
 }
 fetchSelectData()
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
@@ -131,6 +143,14 @@
     //   ruleForm.value = res.data
     // })
   }
+  if ($route.params.type === 'update' && statusName === '全部') {
+    ruleForm.value.approvalType = '2'
+    ruleForm.value.approvalTypeName = '编辑设备'
+    ruleForm.value.id = ''
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
 }
 onMounted(() => {
   initDialog()
@@ -245,7 +265,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: ruleForm.value.id }).then((res) => {
+    cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
       close()
     })
@@ -254,7 +274,7 @@
 // 审批
 const approvalDialogRef = ref()
 const apply = (type: string) => {
-  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId)
+  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId, ruleForm.value.processId, ruleForm.value.id)
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -269,6 +289,7 @@
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        console.log(ruleForm.value.instructionsFile, 'ruleForm.value.instructionsFile')
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
@@ -434,7 +455,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="使用部门">
-              <el-input v-model.trim="ruleForm.deptId" />
+              <!-- <el-input v-model.trim="ruleForm.deptId" /> -->
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -462,11 +484,11 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="附件" prop="instructionsFile">
               <show-photo :minio-file-name="ruleForm.instructionsFile" />
               <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
-              <el-button type="primary" @click="upload">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
                 上传
               </el-button>
             </el-form-item>
@@ -475,7 +497,7 @@
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定(校准)机构" prop="checkOrganization">
@@ -510,7 +532,7 @@
       <technology ref="technologyRef" :data="[]" :status="$route.params.type as string" />
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用岗位" prop="usePosition">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8c434aa..79395c2 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -3,7 +3,10 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { delTextBtn, editTextBtn } from './applyBtns'
-import { cancelInfo, deleteInfo, getInfoList, getInfoListPage, getInfoListTogether } from '@/api/eqpt/device/info'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { cancelInfo, deleteInfo, getInfoList, getInfoListPage, getInfoListTogether, submitInfo } from '@/api/eqpt/device/info'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -36,6 +39,7 @@
   offset: 1,
   limit: 10,
   approvalStatus: '',
+  formId: SCHEDULE.DEVICE_INFO_APPROVAL,
 })
 const columns = ref([
   {
@@ -117,7 +121,7 @@
 const total = ref(0)
 const listLoading = ref(true)
 
-// 获取日志数据
+// 获取列表数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
   if (!isNowPage) {
@@ -130,7 +134,14 @@
     listLoading.value = false
   })
 }
-
+// 获取使用状态列表
+const useStatusList = ref()
+const fetchUseStatus = () => {
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+}
+fetchUseStatus()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -208,10 +219,22 @@
     },
   })
 }
+// 详情
+const detail = (row: any) => {
+  $router.push({
+    path: `/${$props.equipmentType === '1' ? 'info' : 'special'}/detail`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+      equipmentType: $props.equipmentType,
+    },
+  })
+}
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除设备信息码?',
+    `确认删除${$props.statusName === '全部' ? '此设备' : '此记录'}设吗?`,
     '确认',
     {
       confirmButtonText: '确认',
@@ -219,16 +242,18 @@
       type: 'warning',
     },
   ).then(() => {
+    // 分删除设备和删除记录
     deleteInfo({ id: row.id }).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      // close()
+      search()
     })
   })
 }
 // 取消
 const canHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除设备信息码?',
+    '确认取消此申请吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -236,12 +261,36 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: row.id }).then((res) => {
+    console.log(row, 'row.processInstanceIdrow.processInstanceId')
+    cancelInfo({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      // close()
+      search()
     })
   })
 }
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: row.id, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
 // 切换表格标识   true:普通表格  false:聚合表格
 const tableFlage = ref(true)
 const changeTable = () => {
@@ -265,10 +314,20 @@
   deep: true,
   // immediate: true,
 })
+const permUrl = ref({
+  edit: '/tested/device/info/edit',
+  del: '/tested/device/info/delete',
+  submit: '/tested/device/info/submit',
+  cancel: '/tested/device/info/cancel',
+  agree: '/tested/device/info/agree',
+  reject: '/tested/device/info/reject',
+})
 </script>
 
 <template>
   <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -282,7 +341,7 @@
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="管理状态" clearable>
-          <el-option v-for="item in []" :key="item.value" :label="item.name" :value="item.value" />
+          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
@@ -329,19 +388,43 @@
                 {{ scope.row[column.value] }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="140" align="center">
+          <el-table-column label="操作" width="160" align="center">
             <template #default=" scope ">
-              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
               <el-button
-                v-if=" editTextBtn($props.statusName) " link type="primary" size="small"
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
                 @click="handler(scope.row, 'update')"
               >
                 编辑
               </el-button>
               <el-button
-                v-if=" delTextBtn($props.statusName) " link type="danger" size="small"
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index cdec7d2..35ce9df 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 const $route = useRoute()
@@ -21,22 +22,36 @@
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const ruleForm = ref({
+  equipmentList: [],
+  groupInfo: {
+    createTime: '',
+    createUserId: '',
+    createUserName: '',
+    groupName: '',
+    id: '',
+    updateTime: '',
+    remark: '',
+  },
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type === 'create') {
-    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createUserId = userStore.id
+    ruleForm.value.groupInfo.createUserName = userStore.name
   }
   else {
-    ruleForm.value = JSON.parse($route.query.row as string)
-    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
-    //   ruleForm.value = res.data
-    // })
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    detailGroup({ groupId: data.id }).then((res) => {
+      ruleForm.value = res.data
+    })
   }
 }
 onMounted(() => {
@@ -46,11 +61,12 @@
 const close = () => {
   $router.back()
 }
+const tableRef = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
-    if (valid) {
+    if (valid && tableRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -60,38 +76,23 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.attachments = tableRef.value.list
-        ruleForm.value.technicalTargetList = technologyRef.value.list
-        editInfo(ruleForm.value).then((res) => {
-          console.log(res.data, '123')
-          ElMessage.success('保存成功')
-          submitId.value = res.data
-        })
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          addGroup(ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          updateGroup(ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
       })
     }
   })
 }
-// 提交
-const submitForm = () => {
-  if (!submitId.value) {
-    ElMessage.warning('请先保存')
-    return false
-  }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
-      ElMessage.success('已提交')
-      close()
-    })
-  })
-}
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
@@ -113,35 +114,39 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm.groupInfo"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+      >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="分组名称">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model.trim="ruleForm.groupInfo.groupName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" />
+              <el-input v-model.trim="ruleForm.groupInfo.createUserName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" />
+              <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
-            <el-form-item label="备注">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.groupInfo.remark" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+      <table-list ref="tableRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index abba0f0..7514857 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getGroupList } from '@/api/eqpt/device/group'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   groupName: '',
@@ -41,33 +42,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getInfoListPage(listQuery, $props.statusName).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
-  total.value = 3
-  list.value = [
-    {
-      groupName: '分组1',
-      createUserName: '张三',
-      createTime: '2023-07-28 00:00:00',
-      remark: '这是备注1',
-    },
-    {
-      groupName: '分组2',
-      createUserName: '王五',
-      createTime: '2023-07-28 08:00:00',
-      remark: '这是备注2',
-    },
-    {
-      groupName: '分组3',
-      createUserName: '李四',
-      createTime: '2023-07-28 09:00:00',
-      remark: '这是备注3',
-    },
-  ]
+  getGroupList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 25c3ab6..fbfbcf1 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -1,6 +1,7 @@
 <!-- 设备分组 - 设备信息 -->
 <script lang="ts" setup name="EditPlatform">
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
@@ -16,43 +17,43 @@
 const columns = ref([
   {
     text: '统一编号',
-    value: 'name',
+    value: 'equipmentNo',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '设备名称',
-    value: 'information',
+    value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '型号规格',
-    value: 'location',
+    value: 'model',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '负责人',
-    value: 'location',
+    value: 'directorName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '计量标识',
-    value: 'location',
+    value: 'meterIdentify',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '证书有效期',
-    value: 'location',
+    value: 'certificateValid',
     required: true,
-    isSelect: false, // 是否下拉框
+    isSelect: true, // 是否下拉框
   },
   {
     text: '安装位置',
-    value: 'location',
+    value: 'installLocation',
     required: true,
     isSelect: false, // 是否下拉框
   },
@@ -60,17 +61,7 @@
 const list = ref([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '设备信息')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -97,9 +88,13 @@
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
-      name: '',
-      information: '',
-      location: '',
+      equipmentNo: '',
+      equipmentName: '',
+      model: '',
+      directorName: '',
+      meterIdentify: '',
+      certificateValid: '',
+      installLocation: '',
       editable: true,
     })
   }
@@ -114,9 +109,18 @@
   list.value = $props.data
   dialogStatus.value = $props.status
 }
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    console.log(newVal, 'newVal')
+    list.value = newVal
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 initDialog()
 defineExpose({
-  list,
+  list, checkCertificateList,
 })
 </script>
 
@@ -152,8 +156,10 @@
             v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           />
-          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+          <el-date-picker
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
+          />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
new file mode 100644
index 0000000..1dfa04b
--- /dev/null
+++ b/src/views/tested/device/info/components/detail.vue
@@ -0,0 +1,54 @@
+<!-- 证书到期提醒，详情 -->
+<script lang="ts" setup name="addNotice">
+import baseInfo from '@/views/tested/device/info/components/edit.vue'
+import reportTable from '@/views/tested/device/info/components/reportTable.vue'
+import statusTable from '@/views/tested/device/info/components/statusTable.vue'
+import roamTable from '@/views/tested/device/info/components/roamTable.vue'
+const activeName = ref('基本信息')
+const $router = useRouter()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page title="设备基本信息-详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-tabs v-model="activeName" type="card" class="demo-tabs">
+        <el-tab-pane label="基本信息" name="基本信息">
+          <base-info class="device-base-info" />
+        </el-tab-pane>
+        <el-tab-pane label="证书报告" name="证书报告">
+          <report-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="状态变更记录" name="状态变更记录">
+          <status-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="设备流转日志" name="设备流转日志">
+          <roam-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="审批详情" name="审批详情">
+          <!-- <roam-table :data="[]" status="detail" /> -->
+          审批详情
+        </el-tab-pane>
+      </el-tabs>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.device-base-info {
+  ::v-deep(.base-info-device) {
+    display: none;
+  }
+
+  // ::v-deep(.header) {
+  //   display: none;
+  // }
+}
+</style>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 9fa954e..b768fb5 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -7,6 +7,8 @@
 import technology from './technology.vue'
 import showPhoto from './showPhoto.vue'
 import { editBtn, submitBtn } from './applyBtns'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelInfo, deleteInfo, editInfo, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
@@ -113,6 +115,16 @@
   fetchInUse()
 }
 fetchSelectData()
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
@@ -131,6 +143,14 @@
     //   ruleForm.value = res.data
     // })
   }
+  if ($route.params.type === 'update' && statusName === '全部') {
+    ruleForm.value.approvalType = '2'
+    ruleForm.value.approvalTypeName = '编辑设备'
+    ruleForm.value.id = ''
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
 }
 onMounted(() => {
   initDialog()
@@ -245,7 +265,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: ruleForm.value.id }).then((res) => {
+    cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
       close()
     })
@@ -254,7 +274,7 @@
 // 审批
 const approvalDialogRef = ref()
 const apply = (type: string) => {
-  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId)
+  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId, ruleForm.value.processId, ruleForm.value.id)
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -269,6 +289,7 @@
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        console.log(ruleForm.value.instructionsFile, 'ruleForm.value.instructionsFile')
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
@@ -434,7 +455,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="使用部门">
-              <el-input v-model.trim="ruleForm.deptId" />
+              <!-- <el-input v-model.trim="ruleForm.deptId" /> -->
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -462,11 +484,11 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="附件" prop="instructionsFile">
               <show-photo :minio-file-name="ruleForm.instructionsFile" />
               <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
-              <el-button type="primary" @click="upload">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
                 上传
               </el-button>
             </el-form-item>
@@ -475,7 +497,7 @@
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定(校准)机构" prop="checkOrganization">
@@ -510,7 +532,7 @@
       <technology ref="technologyRef" :data="[]" :status="$route.params.type as string" />
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用岗位" prop="usePosition">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8c434aa..79395c2 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -3,7 +3,10 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { delTextBtn, editTextBtn } from './applyBtns'
-import { cancelInfo, deleteInfo, getInfoList, getInfoListPage, getInfoListTogether } from '@/api/eqpt/device/info'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { cancelInfo, deleteInfo, getInfoList, getInfoListPage, getInfoListTogether, submitInfo } from '@/api/eqpt/device/info'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -36,6 +39,7 @@
   offset: 1,
   limit: 10,
   approvalStatus: '',
+  formId: SCHEDULE.DEVICE_INFO_APPROVAL,
 })
 const columns = ref([
   {
@@ -117,7 +121,7 @@
 const total = ref(0)
 const listLoading = ref(true)
 
-// 获取日志数据
+// 获取列表数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
   if (!isNowPage) {
@@ -130,7 +134,14 @@
     listLoading.value = false
   })
 }
-
+// 获取使用状态列表
+const useStatusList = ref()
+const fetchUseStatus = () => {
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+}
+fetchUseStatus()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -208,10 +219,22 @@
     },
   })
 }
+// 详情
+const detail = (row: any) => {
+  $router.push({
+    path: `/${$props.equipmentType === '1' ? 'info' : 'special'}/detail`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+      equipmentType: $props.equipmentType,
+    },
+  })
+}
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除设备信息码?',
+    `确认删除${$props.statusName === '全部' ? '此设备' : '此记录'}设吗?`,
     '确认',
     {
       confirmButtonText: '确认',
@@ -219,16 +242,18 @@
       type: 'warning',
     },
   ).then(() => {
+    // 分删除设备和删除记录
     deleteInfo({ id: row.id }).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      // close()
+      search()
     })
   })
 }
 // 取消
 const canHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除设备信息码?',
+    '确认取消此申请吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -236,12 +261,36 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: row.id }).then((res) => {
+    console.log(row, 'row.processInstanceIdrow.processInstanceId')
+    cancelInfo({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      // close()
+      search()
     })
   })
 }
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: row.id, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
 // 切换表格标识   true:普通表格  false:聚合表格
 const tableFlage = ref(true)
 const changeTable = () => {
@@ -265,10 +314,20 @@
   deep: true,
   // immediate: true,
 })
+const permUrl = ref({
+  edit: '/tested/device/info/edit',
+  del: '/tested/device/info/delete',
+  submit: '/tested/device/info/submit',
+  cancel: '/tested/device/info/cancel',
+  agree: '/tested/device/info/agree',
+  reject: '/tested/device/info/reject',
+})
 </script>
 
 <template>
   <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -282,7 +341,7 @@
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="管理状态" clearable>
-          <el-option v-for="item in []" :key="item.value" :label="item.name" :value="item.value" />
+          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
@@ -329,19 +388,43 @@
                 {{ scope.row[column.value] }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="140" align="center">
+          <el-table-column label="操作" width="160" align="center">
             <template #default=" scope ">
-              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
               <el-button
-                v-if=" editTextBtn($props.statusName) " link type="primary" size="small"
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
                 @click="handler(scope.row, 'update')"
               >
                 编辑
               </el-button>
               <el-button
-                v-if=" delTextBtn($props.statusName) " link type="danger" size="small"
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
diff --git a/src/views/tested/device/info/components/reportTable.vue b/src/views/tested/device/info/components/reportTable.vue
new file mode 100644
index 0000000..9ea4536
--- /dev/null
+++ b/src/views/tested/device/info/components/reportTable.vue
@@ -0,0 +1,164 @@
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+  status: {
+    type: String,
+    required: true,
+  },
+})
+const dialogStatus = ref('update') // 对话框类型：create,update
+// 表头显示标题
+const columns = ref([
+  {
+    text: '证书编号',
+    value: 'name',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书名称',
+    value: 'information',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '校准(检定)单位',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书日期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书有效期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书附件',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref([])
+// 检查数据列表
+function checkCertificateList() {
+  for (let index = 0; index < list.value.length; index++) {
+    const item = list.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (dialogStatus.value == 'detail') {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  // certificateRef.value.initDialog({ title: '添加' })
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      name: '',
+      information: '',
+      location: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+const initDialog = () => {
+  list.value = $props.data
+  dialogStatus.value = $props.status
+}
+initDialog()
+defineExpose({
+  list,
+})
+</script>
+
+<template>
+  <detail-block-switch title="证书报告">
+    <template v-if="dialogStatus !== 'detail'" #btns>
+      <el-button type="primary">
+        扫描增加
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="dialogStatus !== 'detail'" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index cdec7d2..35ce9df 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 const $route = useRoute()
@@ -21,22 +22,36 @@
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const ruleForm = ref({
+  equipmentList: [],
+  groupInfo: {
+    createTime: '',
+    createUserId: '',
+    createUserName: '',
+    groupName: '',
+    id: '',
+    updateTime: '',
+    remark: '',
+  },
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type === 'create') {
-    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createUserId = userStore.id
+    ruleForm.value.groupInfo.createUserName = userStore.name
   }
   else {
-    ruleForm.value = JSON.parse($route.query.row as string)
-    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
-    //   ruleForm.value = res.data
-    // })
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    detailGroup({ groupId: data.id }).then((res) => {
+      ruleForm.value = res.data
+    })
   }
 }
 onMounted(() => {
@@ -46,11 +61,12 @@
 const close = () => {
   $router.back()
 }
+const tableRef = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
-    if (valid) {
+    if (valid && tableRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -60,38 +76,23 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.attachments = tableRef.value.list
-        ruleForm.value.technicalTargetList = technologyRef.value.list
-        editInfo(ruleForm.value).then((res) => {
-          console.log(res.data, '123')
-          ElMessage.success('保存成功')
-          submitId.value = res.data
-        })
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          addGroup(ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          updateGroup(ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
       })
     }
   })
 }
-// 提交
-const submitForm = () => {
-  if (!submitId.value) {
-    ElMessage.warning('请先保存')
-    return false
-  }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
-      ElMessage.success('已提交')
-      close()
-    })
-  })
-}
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
@@ -113,35 +114,39 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm.groupInfo"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+      >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="分组名称">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model.trim="ruleForm.groupInfo.groupName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" />
+              <el-input v-model.trim="ruleForm.groupInfo.createUserName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" />
+              <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
-            <el-form-item label="备注">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.groupInfo.remark" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+      <table-list ref="tableRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index abba0f0..7514857 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getGroupList } from '@/api/eqpt/device/group'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   groupName: '',
@@ -41,33 +42,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getInfoListPage(listQuery, $props.statusName).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
-  total.value = 3
-  list.value = [
-    {
-      groupName: '分组1',
-      createUserName: '张三',
-      createTime: '2023-07-28 00:00:00',
-      remark: '这是备注1',
-    },
-    {
-      groupName: '分组2',
-      createUserName: '王五',
-      createTime: '2023-07-28 08:00:00',
-      remark: '这是备注2',
-    },
-    {
-      groupName: '分组3',
-      createUserName: '李四',
-      createTime: '2023-07-28 09:00:00',
-      remark: '这是备注3',
-    },
-  ]
+  getGroupList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 25c3ab6..fbfbcf1 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -1,6 +1,7 @@
 <!-- 设备分组 - 设备信息 -->
 <script lang="ts" setup name="EditPlatform">
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
@@ -16,43 +17,43 @@
 const columns = ref([
   {
     text: '统一编号',
-    value: 'name',
+    value: 'equipmentNo',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '设备名称',
-    value: 'information',
+    value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '型号规格',
-    value: 'location',
+    value: 'model',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '负责人',
-    value: 'location',
+    value: 'directorName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '计量标识',
-    value: 'location',
+    value: 'meterIdentify',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '证书有效期',
-    value: 'location',
+    value: 'certificateValid',
     required: true,
-    isSelect: false, // 是否下拉框
+    isSelect: true, // 是否下拉框
   },
   {
     text: '安装位置',
-    value: 'location',
+    value: 'installLocation',
     required: true,
     isSelect: false, // 是否下拉框
   },
@@ -60,17 +61,7 @@
 const list = ref([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '设备信息')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -97,9 +88,13 @@
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
-      name: '',
-      information: '',
-      location: '',
+      equipmentNo: '',
+      equipmentName: '',
+      model: '',
+      directorName: '',
+      meterIdentify: '',
+      certificateValid: '',
+      installLocation: '',
       editable: true,
     })
   }
@@ -114,9 +109,18 @@
   list.value = $props.data
   dialogStatus.value = $props.status
 }
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    console.log(newVal, 'newVal')
+    list.value = newVal
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 initDialog()
 defineExpose({
-  list,
+  list, checkCertificateList,
 })
 </script>
 
@@ -152,8 +156,10 @@
             v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           />
-          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+          <el-date-picker
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
+          />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
new file mode 100644
index 0000000..1dfa04b
--- /dev/null
+++ b/src/views/tested/device/info/components/detail.vue
@@ -0,0 +1,54 @@
+<!-- 证书到期提醒，详情 -->
+<script lang="ts" setup name="addNotice">
+import baseInfo from '@/views/tested/device/info/components/edit.vue'
+import reportTable from '@/views/tested/device/info/components/reportTable.vue'
+import statusTable from '@/views/tested/device/info/components/statusTable.vue'
+import roamTable from '@/views/tested/device/info/components/roamTable.vue'
+const activeName = ref('基本信息')
+const $router = useRouter()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page title="设备基本信息-详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-tabs v-model="activeName" type="card" class="demo-tabs">
+        <el-tab-pane label="基本信息" name="基本信息">
+          <base-info class="device-base-info" />
+        </el-tab-pane>
+        <el-tab-pane label="证书报告" name="证书报告">
+          <report-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="状态变更记录" name="状态变更记录">
+          <status-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="设备流转日志" name="设备流转日志">
+          <roam-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="审批详情" name="审批详情">
+          <!-- <roam-table :data="[]" status="detail" /> -->
+          审批详情
+        </el-tab-pane>
+      </el-tabs>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.device-base-info {
+  ::v-deep(.base-info-device) {
+    display: none;
+  }
+
+  // ::v-deep(.header) {
+  //   display: none;
+  // }
+}
+</style>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 9fa954e..b768fb5 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -7,6 +7,8 @@
 import technology from './technology.vue'
 import showPhoto from './showPhoto.vue'
 import { editBtn, submitBtn } from './applyBtns'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelInfo, deleteInfo, editInfo, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
@@ -113,6 +115,16 @@
   fetchInUse()
 }
 fetchSelectData()
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
@@ -131,6 +143,14 @@
     //   ruleForm.value = res.data
     // })
   }
+  if ($route.params.type === 'update' && statusName === '全部') {
+    ruleForm.value.approvalType = '2'
+    ruleForm.value.approvalTypeName = '编辑设备'
+    ruleForm.value.id = ''
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
 }
 onMounted(() => {
   initDialog()
@@ -245,7 +265,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: ruleForm.value.id }).then((res) => {
+    cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
       close()
     })
@@ -254,7 +274,7 @@
 // 审批
 const approvalDialogRef = ref()
 const apply = (type: string) => {
-  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId)
+  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId, ruleForm.value.processId, ruleForm.value.id)
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -269,6 +289,7 @@
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        console.log(ruleForm.value.instructionsFile, 'ruleForm.value.instructionsFile')
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
@@ -434,7 +455,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="使用部门">
-              <el-input v-model.trim="ruleForm.deptId" />
+              <!-- <el-input v-model.trim="ruleForm.deptId" /> -->
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -462,11 +484,11 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="附件" prop="instructionsFile">
               <show-photo :minio-file-name="ruleForm.instructionsFile" />
               <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
-              <el-button type="primary" @click="upload">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
                 上传
               </el-button>
             </el-form-item>
@@ -475,7 +497,7 @@
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定(校准)机构" prop="checkOrganization">
@@ -510,7 +532,7 @@
       <technology ref="technologyRef" :data="[]" :status="$route.params.type as string" />
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用岗位" prop="usePosition">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8c434aa..79395c2 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -3,7 +3,10 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { delTextBtn, editTextBtn } from './applyBtns'
-import { cancelInfo, deleteInfo, getInfoList, getInfoListPage, getInfoListTogether } from '@/api/eqpt/device/info'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { cancelInfo, deleteInfo, getInfoList, getInfoListPage, getInfoListTogether, submitInfo } from '@/api/eqpt/device/info'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -36,6 +39,7 @@
   offset: 1,
   limit: 10,
   approvalStatus: '',
+  formId: SCHEDULE.DEVICE_INFO_APPROVAL,
 })
 const columns = ref([
   {
@@ -117,7 +121,7 @@
 const total = ref(0)
 const listLoading = ref(true)
 
-// 获取日志数据
+// 获取列表数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
   if (!isNowPage) {
@@ -130,7 +134,14 @@
     listLoading.value = false
   })
 }
-
+// 获取使用状态列表
+const useStatusList = ref()
+const fetchUseStatus = () => {
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+}
+fetchUseStatus()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -208,10 +219,22 @@
     },
   })
 }
+// 详情
+const detail = (row: any) => {
+  $router.push({
+    path: `/${$props.equipmentType === '1' ? 'info' : 'special'}/detail`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+      equipmentType: $props.equipmentType,
+    },
+  })
+}
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除设备信息码?',
+    `确认删除${$props.statusName === '全部' ? '此设备' : '此记录'}设吗?`,
     '确认',
     {
       confirmButtonText: '确认',
@@ -219,16 +242,18 @@
       type: 'warning',
     },
   ).then(() => {
+    // 分删除设备和删除记录
     deleteInfo({ id: row.id }).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      // close()
+      search()
     })
   })
 }
 // 取消
 const canHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除设备信息码?',
+    '确认取消此申请吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -236,12 +261,36 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: row.id }).then((res) => {
+    console.log(row, 'row.processInstanceIdrow.processInstanceId')
+    cancelInfo({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      // close()
+      search()
     })
   })
 }
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: row.id, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
 // 切换表格标识   true:普通表格  false:聚合表格
 const tableFlage = ref(true)
 const changeTable = () => {
@@ -265,10 +314,20 @@
   deep: true,
   // immediate: true,
 })
+const permUrl = ref({
+  edit: '/tested/device/info/edit',
+  del: '/tested/device/info/delete',
+  submit: '/tested/device/info/submit',
+  cancel: '/tested/device/info/cancel',
+  agree: '/tested/device/info/agree',
+  reject: '/tested/device/info/reject',
+})
 </script>
 
 <template>
   <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -282,7 +341,7 @@
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="管理状态" clearable>
-          <el-option v-for="item in []" :key="item.value" :label="item.name" :value="item.value" />
+          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
@@ -329,19 +388,43 @@
                 {{ scope.row[column.value] }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="140" align="center">
+          <el-table-column label="操作" width="160" align="center">
             <template #default=" scope ">
-              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
               <el-button
-                v-if=" editTextBtn($props.statusName) " link type="primary" size="small"
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
                 @click="handler(scope.row, 'update')"
               >
                 编辑
               </el-button>
               <el-button
-                v-if=" delTextBtn($props.statusName) " link type="danger" size="small"
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
diff --git a/src/views/tested/device/info/components/reportTable.vue b/src/views/tested/device/info/components/reportTable.vue
new file mode 100644
index 0000000..9ea4536
--- /dev/null
+++ b/src/views/tested/device/info/components/reportTable.vue
@@ -0,0 +1,164 @@
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+  status: {
+    type: String,
+    required: true,
+  },
+})
+const dialogStatus = ref('update') // 对话框类型：create,update
+// 表头显示标题
+const columns = ref([
+  {
+    text: '证书编号',
+    value: 'name',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书名称',
+    value: 'information',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '校准(检定)单位',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书日期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书有效期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书附件',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref([])
+// 检查数据列表
+function checkCertificateList() {
+  for (let index = 0; index < list.value.length; index++) {
+    const item = list.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (dialogStatus.value == 'detail') {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  // certificateRef.value.initDialog({ title: '添加' })
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      name: '',
+      information: '',
+      location: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+const initDialog = () => {
+  list.value = $props.data
+  dialogStatus.value = $props.status
+}
+initDialog()
+defineExpose({
+  list,
+})
+</script>
+
+<template>
+  <detail-block-switch title="证书报告">
+    <template v-if="dialogStatus !== 'detail'" #btns>
+      <el-button type="primary">
+        扫描增加
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="dialogStatus !== 'detail'" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/info/components/roamTable.vue b/src/views/tested/device/info/components/roamTable.vue
new file mode 100644
index 0000000..3d7e8fb
--- /dev/null
+++ b/src/views/tested/device/info/components/roamTable.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+  status: {
+    type: String,
+    required: true,
+  },
+})
+const dialogStatus = ref('update') // 对话框类型：create,update
+// 表头显示标题
+const columns = ref([
+  {
+    text: '使用部门',
+    value: 'name',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '使用岗位',
+    value: 'information',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '负责人',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '记录日期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref([])
+// 检查数据列表
+function checkCertificateList() {
+  for (let index = 0; index < list.value.length; index++) {
+    const item = list.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (dialogStatus.value == 'detail') {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  // certificateRef.value.initDialog({ title: '添加' })
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      name: '',
+      information: '',
+      location: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+const initDialog = () => {
+  list.value = $props.data
+  dialogStatus.value = $props.status
+}
+initDialog()
+defineExpose({
+  list,
+})
+</script>
+
+<template>
+  <detail-block-switch title="设备流转日志">
+    <template v-if="dialogStatus !== 'detail'" #btns>
+      <el-button type="primary">
+        扫描增加
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="dialogStatus !== 'detail'" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index cdec7d2..35ce9df 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 const $route = useRoute()
@@ -21,22 +22,36 @@
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const ruleForm = ref({
+  equipmentList: [],
+  groupInfo: {
+    createTime: '',
+    createUserId: '',
+    createUserName: '',
+    groupName: '',
+    id: '',
+    updateTime: '',
+    remark: '',
+  },
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type === 'create') {
-    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createUserId = userStore.id
+    ruleForm.value.groupInfo.createUserName = userStore.name
   }
   else {
-    ruleForm.value = JSON.parse($route.query.row as string)
-    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
-    //   ruleForm.value = res.data
-    // })
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    detailGroup({ groupId: data.id }).then((res) => {
+      ruleForm.value = res.data
+    })
   }
 }
 onMounted(() => {
@@ -46,11 +61,12 @@
 const close = () => {
   $router.back()
 }
+const tableRef = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
-    if (valid) {
+    if (valid && tableRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -60,38 +76,23 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.attachments = tableRef.value.list
-        ruleForm.value.technicalTargetList = technologyRef.value.list
-        editInfo(ruleForm.value).then((res) => {
-          console.log(res.data, '123')
-          ElMessage.success('保存成功')
-          submitId.value = res.data
-        })
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          addGroup(ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          updateGroup(ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
       })
     }
   })
 }
-// 提交
-const submitForm = () => {
-  if (!submitId.value) {
-    ElMessage.warning('请先保存')
-    return false
-  }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
-      ElMessage.success('已提交')
-      close()
-    })
-  })
-}
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
@@ -113,35 +114,39 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm.groupInfo"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+      >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="分组名称">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model.trim="ruleForm.groupInfo.groupName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" />
+              <el-input v-model.trim="ruleForm.groupInfo.createUserName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" />
+              <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
-            <el-form-item label="备注">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.groupInfo.remark" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+      <table-list ref="tableRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index abba0f0..7514857 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getGroupList } from '@/api/eqpt/device/group'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   groupName: '',
@@ -41,33 +42,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getInfoListPage(listQuery, $props.statusName).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
-  total.value = 3
-  list.value = [
-    {
-      groupName: '分组1',
-      createUserName: '张三',
-      createTime: '2023-07-28 00:00:00',
-      remark: '这是备注1',
-    },
-    {
-      groupName: '分组2',
-      createUserName: '王五',
-      createTime: '2023-07-28 08:00:00',
-      remark: '这是备注2',
-    },
-    {
-      groupName: '分组3',
-      createUserName: '李四',
-      createTime: '2023-07-28 09:00:00',
-      remark: '这是备注3',
-    },
-  ]
+  getGroupList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 25c3ab6..fbfbcf1 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -1,6 +1,7 @@
 <!-- 设备分组 - 设备信息 -->
 <script lang="ts" setup name="EditPlatform">
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
@@ -16,43 +17,43 @@
 const columns = ref([
   {
     text: '统一编号',
-    value: 'name',
+    value: 'equipmentNo',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '设备名称',
-    value: 'information',
+    value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '型号规格',
-    value: 'location',
+    value: 'model',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '负责人',
-    value: 'location',
+    value: 'directorName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '计量标识',
-    value: 'location',
+    value: 'meterIdentify',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '证书有效期',
-    value: 'location',
+    value: 'certificateValid',
     required: true,
-    isSelect: false, // 是否下拉框
+    isSelect: true, // 是否下拉框
   },
   {
     text: '安装位置',
-    value: 'location',
+    value: 'installLocation',
     required: true,
     isSelect: false, // 是否下拉框
   },
@@ -60,17 +61,7 @@
 const list = ref([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '设备信息')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -97,9 +88,13 @@
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
-      name: '',
-      information: '',
-      location: '',
+      equipmentNo: '',
+      equipmentName: '',
+      model: '',
+      directorName: '',
+      meterIdentify: '',
+      certificateValid: '',
+      installLocation: '',
       editable: true,
     })
   }
@@ -114,9 +109,18 @@
   list.value = $props.data
   dialogStatus.value = $props.status
 }
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    console.log(newVal, 'newVal')
+    list.value = newVal
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 initDialog()
 defineExpose({
-  list,
+  list, checkCertificateList,
 })
 </script>
 
@@ -152,8 +156,10 @@
             v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           />
-          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+          <el-date-picker
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
+          />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
new file mode 100644
index 0000000..1dfa04b
--- /dev/null
+++ b/src/views/tested/device/info/components/detail.vue
@@ -0,0 +1,54 @@
+<!-- 证书到期提醒，详情 -->
+<script lang="ts" setup name="addNotice">
+import baseInfo from '@/views/tested/device/info/components/edit.vue'
+import reportTable from '@/views/tested/device/info/components/reportTable.vue'
+import statusTable from '@/views/tested/device/info/components/statusTable.vue'
+import roamTable from '@/views/tested/device/info/components/roamTable.vue'
+const activeName = ref('基本信息')
+const $router = useRouter()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page title="设备基本信息-详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-tabs v-model="activeName" type="card" class="demo-tabs">
+        <el-tab-pane label="基本信息" name="基本信息">
+          <base-info class="device-base-info" />
+        </el-tab-pane>
+        <el-tab-pane label="证书报告" name="证书报告">
+          <report-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="状态变更记录" name="状态变更记录">
+          <status-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="设备流转日志" name="设备流转日志">
+          <roam-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="审批详情" name="审批详情">
+          <!-- <roam-table :data="[]" status="detail" /> -->
+          审批详情
+        </el-tab-pane>
+      </el-tabs>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.device-base-info {
+  ::v-deep(.base-info-device) {
+    display: none;
+  }
+
+  // ::v-deep(.header) {
+  //   display: none;
+  // }
+}
+</style>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 9fa954e..b768fb5 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -7,6 +7,8 @@
 import technology from './technology.vue'
 import showPhoto from './showPhoto.vue'
 import { editBtn, submitBtn } from './applyBtns'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelInfo, deleteInfo, editInfo, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
@@ -113,6 +115,16 @@
   fetchInUse()
 }
 fetchSelectData()
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
@@ -131,6 +143,14 @@
     //   ruleForm.value = res.data
     // })
   }
+  if ($route.params.type === 'update' && statusName === '全部') {
+    ruleForm.value.approvalType = '2'
+    ruleForm.value.approvalTypeName = '编辑设备'
+    ruleForm.value.id = ''
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
 }
 onMounted(() => {
   initDialog()
@@ -245,7 +265,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: ruleForm.value.id }).then((res) => {
+    cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
       close()
     })
@@ -254,7 +274,7 @@
 // 审批
 const approvalDialogRef = ref()
 const apply = (type: string) => {
-  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId)
+  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId, ruleForm.value.processId, ruleForm.value.id)
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -269,6 +289,7 @@
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        console.log(ruleForm.value.instructionsFile, 'ruleForm.value.instructionsFile')
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
@@ -434,7 +455,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="使用部门">
-              <el-input v-model.trim="ruleForm.deptId" />
+              <!-- <el-input v-model.trim="ruleForm.deptId" /> -->
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -462,11 +484,11 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="附件" prop="instructionsFile">
               <show-photo :minio-file-name="ruleForm.instructionsFile" />
               <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
-              <el-button type="primary" @click="upload">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
                 上传
               </el-button>
             </el-form-item>
@@ -475,7 +497,7 @@
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定(校准)机构" prop="checkOrganization">
@@ -510,7 +532,7 @@
       <technology ref="technologyRef" :data="[]" :status="$route.params.type as string" />
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用岗位" prop="usePosition">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8c434aa..79395c2 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -3,7 +3,10 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { delTextBtn, editTextBtn } from './applyBtns'
-import { cancelInfo, deleteInfo, getInfoList, getInfoListPage, getInfoListTogether } from '@/api/eqpt/device/info'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { cancelInfo, deleteInfo, getInfoList, getInfoListPage, getInfoListTogether, submitInfo } from '@/api/eqpt/device/info'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -36,6 +39,7 @@
   offset: 1,
   limit: 10,
   approvalStatus: '',
+  formId: SCHEDULE.DEVICE_INFO_APPROVAL,
 })
 const columns = ref([
   {
@@ -117,7 +121,7 @@
 const total = ref(0)
 const listLoading = ref(true)
 
-// 获取日志数据
+// 获取列表数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
   if (!isNowPage) {
@@ -130,7 +134,14 @@
     listLoading.value = false
   })
 }
-
+// 获取使用状态列表
+const useStatusList = ref()
+const fetchUseStatus = () => {
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+}
+fetchUseStatus()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -208,10 +219,22 @@
     },
   })
 }
+// 详情
+const detail = (row: any) => {
+  $router.push({
+    path: `/${$props.equipmentType === '1' ? 'info' : 'special'}/detail`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+      equipmentType: $props.equipmentType,
+    },
+  })
+}
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除设备信息码?',
+    `确认删除${$props.statusName === '全部' ? '此设备' : '此记录'}设吗?`,
     '确认',
     {
       confirmButtonText: '确认',
@@ -219,16 +242,18 @@
       type: 'warning',
     },
   ).then(() => {
+    // 分删除设备和删除记录
     deleteInfo({ id: row.id }).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      // close()
+      search()
     })
   })
 }
 // 取消
 const canHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除设备信息码?',
+    '确认取消此申请吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -236,12 +261,36 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: row.id }).then((res) => {
+    console.log(row, 'row.processInstanceIdrow.processInstanceId')
+    cancelInfo({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      // close()
+      search()
     })
   })
 }
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: row.id, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
 // 切换表格标识   true:普通表格  false:聚合表格
 const tableFlage = ref(true)
 const changeTable = () => {
@@ -265,10 +314,20 @@
   deep: true,
   // immediate: true,
 })
+const permUrl = ref({
+  edit: '/tested/device/info/edit',
+  del: '/tested/device/info/delete',
+  submit: '/tested/device/info/submit',
+  cancel: '/tested/device/info/cancel',
+  agree: '/tested/device/info/agree',
+  reject: '/tested/device/info/reject',
+})
 </script>
 
 <template>
   <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -282,7 +341,7 @@
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="管理状态" clearable>
-          <el-option v-for="item in []" :key="item.value" :label="item.name" :value="item.value" />
+          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
@@ -329,19 +388,43 @@
                 {{ scope.row[column.value] }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="140" align="center">
+          <el-table-column label="操作" width="160" align="center">
             <template #default=" scope ">
-              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
               <el-button
-                v-if=" editTextBtn($props.statusName) " link type="primary" size="small"
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
                 @click="handler(scope.row, 'update')"
               >
                 编辑
               </el-button>
               <el-button
-                v-if=" delTextBtn($props.statusName) " link type="danger" size="small"
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
diff --git a/src/views/tested/device/info/components/reportTable.vue b/src/views/tested/device/info/components/reportTable.vue
new file mode 100644
index 0000000..9ea4536
--- /dev/null
+++ b/src/views/tested/device/info/components/reportTable.vue
@@ -0,0 +1,164 @@
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+  status: {
+    type: String,
+    required: true,
+  },
+})
+const dialogStatus = ref('update') // 对话框类型：create,update
+// 表头显示标题
+const columns = ref([
+  {
+    text: '证书编号',
+    value: 'name',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书名称',
+    value: 'information',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '校准(检定)单位',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书日期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书有效期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书附件',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref([])
+// 检查数据列表
+function checkCertificateList() {
+  for (let index = 0; index < list.value.length; index++) {
+    const item = list.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (dialogStatus.value == 'detail') {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  // certificateRef.value.initDialog({ title: '添加' })
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      name: '',
+      information: '',
+      location: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+const initDialog = () => {
+  list.value = $props.data
+  dialogStatus.value = $props.status
+}
+initDialog()
+defineExpose({
+  list,
+})
+</script>
+
+<template>
+  <detail-block-switch title="证书报告">
+    <template v-if="dialogStatus !== 'detail'" #btns>
+      <el-button type="primary">
+        扫描增加
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="dialogStatus !== 'detail'" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/info/components/roamTable.vue b/src/views/tested/device/info/components/roamTable.vue
new file mode 100644
index 0000000..3d7e8fb
--- /dev/null
+++ b/src/views/tested/device/info/components/roamTable.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+  status: {
+    type: String,
+    required: true,
+  },
+})
+const dialogStatus = ref('update') // 对话框类型：create,update
+// 表头显示标题
+const columns = ref([
+  {
+    text: '使用部门',
+    value: 'name',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '使用岗位',
+    value: 'information',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '负责人',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '记录日期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref([])
+// 检查数据列表
+function checkCertificateList() {
+  for (let index = 0; index < list.value.length; index++) {
+    const item = list.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (dialogStatus.value == 'detail') {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  // certificateRef.value.initDialog({ title: '添加' })
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      name: '',
+      information: '',
+      location: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+const initDialog = () => {
+  list.value = $props.data
+  dialogStatus.value = $props.status
+}
+initDialog()
+defineExpose({
+  list,
+})
+</script>
+
+<template>
+  <detail-block-switch title="设备流转日志">
+    <template v-if="dialogStatus !== 'detail'" #btns>
+      <el-button type="primary">
+        扫描增加
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="dialogStatus !== 'detail'" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 6f4faf8..b90aa12 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -27,7 +27,7 @@
         url: '',
       }
     })
-    urlList.value.value.forEach((item) => {
+    urlList.value.forEach((item) => {
       getPhotoUrl(item.minioFileName).then((res) => {
         item.url = res.data
       })

diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
new file mode 100644
index 0000000..7a953d7
--- /dev/null
+++ b/src/api/eqpt/device/group.ts
@@ -0,0 +1,44 @@
+/**
+ * 设备台账-设备分组管理
+ */
+import request from '@/api/index'
+// 分组列表
+export function getGroupList(params: object) {
+  return request({
+    url: '/equipment/group/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateGroup(data: object) {
+  return request({
+    url: '/equipment/group/update',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function addGroup(data: object) {
+  return request({
+    url: '/equipment/group/add',
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function delGroup(data: object) {
+  return request({
+    url: '/equipment/group/delete',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailGroup(params: object) {
+  return request({
+    url: '/equipment/group/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b76afc5..462629e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -16,11 +16,11 @@
 
 // 添加用户
 export function addUser(data: object) {
-  return request.post(`${prefix}mgr/add`, data)
+  return request.post('system/mgr/add', data)
 }
 // 修改用户
 export function updateUser(data: object) {
-  return request.post(`${prefix}mgr/update`, data)
+  return request.post('system/mgr/update', data)
 }
 // 删除用户
 export function delUser(data: { id: string }) {
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 57a38a0..2bb0eef 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -26,6 +26,8 @@
   comments: '', // 备注
   user: '', // 当前用户
   approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
 }
 // 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
 const type = ref('agree')
@@ -50,9 +52,11 @@
  * @param type 审批类型
  * @param taskId 任务id
  */
-function initDialog(type: string, taskId: string) {
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
   formData.type = type
   formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
   formData.user = userInfo.name
   formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   formData.comments = ''
@@ -65,7 +69,7 @@
       if (valid) {
         btnLoading.value = true
         if (formData.type) {
-          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
             ElMessage.success('审批完成')
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index a253b6d..538f977 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -291,6 +291,18 @@
               activeMenu: '/devicelist',
             },
           },
+          {
+            path: '/info/detail',
+            name: 'DeviceDetail',
+            component: () => import('@/views/tested/device/info/components/detail.vue'),
+            meta: {
+              title: '设备信息详情',
+              auth: '/tested/device/info',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/devicelist',
+            },
+          },
         ],
       },
       {
@@ -328,6 +340,18 @@
               activeMenu: '/speciallist',
             },
           },
+          {
+            path: '/special/detail',
+            name: 'SpeciaDetail',
+            component: () => import('@/views/tested/device/info/components/edit.vue'),
+            meta: {
+              title: '设备信息编辑',
+              auth: '/tested/device/special',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/speciallist',
+            },
+          },
         ],
       },
       {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index a71d150..551e62c 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
+      return hasPermission(permPath) && row.approvalStatusName === '待审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -38,7 +38,7 @@
     if: (row: any, permPath: string) => {
       error(permPath)
       // eslint-disable-next-line no-mixed-operators
-      return hasPermission(permPath) && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
+      return hasPermission(permPath) && row.approvalStatusName === '未通过' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '全部'
     },
   },
   submit: {
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index e7a6597..ee6c406 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,5 +2,5 @@
  * 流程字典， 流程代号：流程id-对应表单中的formId
  */
 export enum SCHEDULE {
-  DEVICE_INFO_APPROVAL = 'sbxxgl', // 设备信息管理,
+  DEVICE_INFO_APPROVAL = 'sbtzgl ', // 设备信息管理,
 }
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
new file mode 100644
index 0000000..31a16b9
--- /dev/null
+++ b/src/utils/useCheckList.ts
@@ -0,0 +1,29 @@
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+/**
+ * 检查列表
+ * @param list 要检查的表格数据
+ * @param columns // 表头信息
+ * @param tableTitle // 表格名称
+ */
+export function useCheckList(list: { [key: string]: string }[], columns: TableColumn, tableTitle = '') {
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+    for (const prop of columns) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`${tableTitle}第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
+}
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index d8ea8b5..9596c7b 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -35,6 +35,7 @@
   birthday?: string
   sex?: string // 性别
   roleName?: string
+  attr1?: string
 }
 // 用户列表返回值类型
 export interface userType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 5387580..d9be3d1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,6 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
+  attr1: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -36,6 +37,7 @@
 const roleTreeList = ref([])// 角色树列表数据
 const deptTreeList = ref([])
 const sexList = ref<{ id: string; value: string; name: string }[]>()// 性别选项
+const perTypeList = ref<{ id: string; value: string; name: string }[]>()// 人员类别列表
 const textMap: { [key: string]: string } = {
   update: '编辑用户',
   create: '新增用户',
@@ -71,6 +73,7 @@
   roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
+  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -185,6 +188,9 @@
   getDictByCode('sex').then((response) => {
     sexList.value = response.data
   })
+  getDictByCode('bizStaffType').then((response) => {
+    perTypeList.value = response.data
+  })
   fetchRoleTree()
   fetchDeptTree()
   dialogStatus.value = dialogStatusflag
@@ -307,6 +313,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="人员类别" prop="attr1">
+            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div class="dialog-footer footer">
       <el-button :loading="btnLoading" type="primary" @click="saveData">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index cdec7d2..35ce9df 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 const $route = useRoute()
@@ -21,22 +22,36 @@
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const ruleForm = ref({
+  equipmentList: [],
+  groupInfo: {
+    createTime: '',
+    createUserId: '',
+    createUserName: '',
+    groupName: '',
+    id: '',
+    updateTime: '',
+    remark: '',
+  },
 }) // 表单
 const rules = ref<FormRules>({
-  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+  groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type === 'create') {
-    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.groupInfo.createUserId = userStore.id
+    ruleForm.value.groupInfo.createUserName = userStore.name
   }
   else {
-    ruleForm.value = JSON.parse($route.query.row as string)
-    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
-    //   ruleForm.value = res.data
-    // })
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    detailGroup({ groupId: data.id }).then((res) => {
+      ruleForm.value = res.data
+    })
   }
 }
 onMounted(() => {
@@ -46,11 +61,12 @@
 const close = () => {
   $router.back()
 }
+const tableRef = ref()
 // 保存
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
-    if (valid) {
+    if (valid && tableRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
         '确认保存吗？',
         '提示',
@@ -60,38 +76,23 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.attachments = tableRef.value.list
-        ruleForm.value.technicalTargetList = technologyRef.value.list
-        editInfo(ruleForm.value).then((res) => {
-          console.log(res.data, '123')
-          ElMessage.success('保存成功')
-          submitId.value = res.data
-        })
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          addGroup(ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          updateGroup(ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
       })
     }
   })
 }
-// 提交
-const submitForm = () => {
-  if (!submitId.value) {
-    ElMessage.warning('请先保存')
-    return false
-  }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
-      ElMessage.success('已提交')
-      close()
-    })
-  })
-}
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
@@ -113,35 +114,39 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm.groupInfo"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+      >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="分组名称">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model.trim="ruleForm.groupInfo.groupName" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人">
-              <el-input v-model.trim="ruleForm.createUserName" />
+              <el-input v-model.trim="ruleForm.groupInfo.createUserName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input v-model.trim="ruleForm.createTime" />
+              <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
-            <el-form-item label="备注">
-              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.groupInfo.remark" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+      <table-list ref="tableRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
     </detail-block-com>
   </app-container>
 </template>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index abba0f0..7514857 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { getGroupList } from '@/api/eqpt/device/group'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   groupName: '',
@@ -41,33 +42,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getInfoListPage(listQuery, $props.statusName).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  listLoading.value = false
-  total.value = 3
-  list.value = [
-    {
-      groupName: '分组1',
-      createUserName: '张三',
-      createTime: '2023-07-28 00:00:00',
-      remark: '这是备注1',
-    },
-    {
-      groupName: '分组2',
-      createUserName: '王五',
-      createTime: '2023-07-28 08:00:00',
-      remark: '这是备注2',
-    },
-    {
-      groupName: '分组3',
-      createUserName: '李四',
-      createTime: '2023-07-28 09:00:00',
-      remark: '这是备注3',
-    },
-  ]
+  getGroupList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 25c3ab6..fbfbcf1 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -1,6 +1,7 @@
 <!-- 设备分组 - 设备信息 -->
 <script lang="ts" setup name="EditPlatform">
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
@@ -16,43 +17,43 @@
 const columns = ref([
   {
     text: '统一编号',
-    value: 'name',
+    value: 'equipmentNo',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '设备名称',
-    value: 'information',
+    value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '型号规格',
-    value: 'location',
+    value: 'model',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '负责人',
-    value: 'location',
+    value: 'directorName',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '计量标识',
-    value: 'location',
+    value: 'meterIdentify',
     required: true,
     isSelect: false, // 是否下拉框
   },
   {
     text: '证书有效期',
-    value: 'location',
+    value: 'certificateValid',
     required: true,
-    isSelect: false, // 是否下拉框
+    isSelect: true, // 是否下拉框
   },
   {
     text: '安装位置',
-    value: 'location',
+    value: 'installLocation',
     required: true,
     isSelect: false, // 是否下拉框
   },
@@ -60,17 +61,7 @@
 const list = ref([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '设备信息')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -97,9 +88,13 @@
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
-      name: '',
-      information: '',
-      location: '',
+      equipmentNo: '',
+      equipmentName: '',
+      model: '',
+      directorName: '',
+      meterIdentify: '',
+      certificateValid: '',
+      installLocation: '',
       editable: true,
     })
   }
@@ -114,9 +109,18 @@
   list.value = $props.data
   dialogStatus.value = $props.status
 }
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    console.log(newVal, 'newVal')
+    list.value = newVal
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 initDialog()
 defineExpose({
-  list,
+  list, checkCertificateList,
 })
 </script>
 
@@ -152,8 +156,10 @@
             v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           />
-          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+          <el-date-picker
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
+          />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
new file mode 100644
index 0000000..1dfa04b
--- /dev/null
+++ b/src/views/tested/device/info/components/detail.vue
@@ -0,0 +1,54 @@
+<!-- 证书到期提醒，详情 -->
+<script lang="ts" setup name="addNotice">
+import baseInfo from '@/views/tested/device/info/components/edit.vue'
+import reportTable from '@/views/tested/device/info/components/reportTable.vue'
+import statusTable from '@/views/tested/device/info/components/statusTable.vue'
+import roamTable from '@/views/tested/device/info/components/roamTable.vue'
+const activeName = ref('基本信息')
+const $router = useRouter()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page title="设备基本信息-详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-tabs v-model="activeName" type="card" class="demo-tabs">
+        <el-tab-pane label="基本信息" name="基本信息">
+          <base-info class="device-base-info" />
+        </el-tab-pane>
+        <el-tab-pane label="证书报告" name="证书报告">
+          <report-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="状态变更记录" name="状态变更记录">
+          <status-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="设备流转日志" name="设备流转日志">
+          <roam-table :data="[]" status="detail" />
+        </el-tab-pane>
+        <el-tab-pane label="审批详情" name="审批详情">
+          <!-- <roam-table :data="[]" status="detail" /> -->
+          审批详情
+        </el-tab-pane>
+      </el-tabs>
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.device-base-info {
+  ::v-deep(.base-info-device) {
+    display: none;
+  }
+
+  // ::v-deep(.header) {
+  //   display: none;
+  // }
+}
+</style>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 9fa954e..b768fb5 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -7,6 +7,8 @@
 import technology from './technology.vue'
 import showPhoto from './showPhoto.vue'
 import { editBtn, submitBtn } from './applyBtns'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelInfo, deleteInfo, editInfo, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
@@ -113,6 +115,16 @@
   fetchInUse()
 }
 fetchSelectData()
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+fetchDeptTree()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
@@ -131,6 +143,14 @@
     //   ruleForm.value = res.data
     // })
   }
+  if ($route.params.type === 'update' && statusName === '全部') {
+    ruleForm.value.approvalType = '2'
+    ruleForm.value.approvalTypeName = '编辑设备'
+    ruleForm.value.id = ''
+    ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
 }
 onMounted(() => {
   initDialog()
@@ -245,7 +265,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: ruleForm.value.id }).then((res) => {
+    cancelInfo({ id: ruleForm.value.id, processInstanceId: ruleForm.value.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
       close()
     })
@@ -254,7 +274,7 @@
 // 审批
 const approvalDialogRef = ref()
 const apply = (type: string) => {
-  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId)
+  approvalDialogRef.value.initDialog(type, ruleForm.value.taskId, ruleForm.value.processId, ruleForm.value.id)
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -269,6 +289,7 @@
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        console.log(ruleForm.value.instructionsFile, 'ruleForm.value.instructionsFile')
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
@@ -434,7 +455,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="使用部门">
-              <el-input v-model.trim="ruleForm.deptId" />
+              <!-- <el-input v-model.trim="ruleForm.deptId" /> -->
+              <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -462,11 +484,11 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="附件" prop="instructionsFile">
               <show-photo :minio-file-name="ruleForm.instructionsFile" />
               <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
-              <el-button type="primary" @click="upload">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
                 上传
               </el-button>
             </el-form-item>
@@ -475,7 +497,7 @@
       </el-form>
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="检定(校准)机构" prop="checkOrganization">
@@ -510,7 +532,7 @@
       <technology ref="technologyRef" :data="[]" :status="$route.params.type as string" />
     </detail-block-com>
     <detail-block-com>
-      <el-form label-position="right" label-width="110px" class="form">
+      <el-form label-position="right" label-width="110px" class="form" :disabled="dialogStatus === 'detail'">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="使用岗位" prop="usePosition">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 8c434aa..79395c2 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -3,7 +3,10 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { delTextBtn, editTextBtn } from './applyBtns'
-import { cancelInfo, deleteInfo, getInfoList, getInfoListPage, getInfoListTogether } from '@/api/eqpt/device/info'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { cancelInfo, deleteInfo, getInfoList, getInfoListPage, getInfoListTogether, submitInfo } from '@/api/eqpt/device/info'
+import { getDictByCode } from '@/api/system/dict'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -36,6 +39,7 @@
   offset: 1,
   limit: 10,
   approvalStatus: '',
+  formId: SCHEDULE.DEVICE_INFO_APPROVAL,
 })
 const columns = ref([
   {
@@ -117,7 +121,7 @@
 const total = ref(0)
 const listLoading = ref(true)
 
-// 获取日志数据
+// 获取列表数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
   if (!isNowPage) {
@@ -130,7 +134,14 @@
     listLoading.value = false
   })
 }
-
+// 获取使用状态列表
+const useStatusList = ref()
+const fetchUseStatus = () => {
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
+}
+fetchUseStatus()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -208,10 +219,22 @@
     },
   })
 }
+// 详情
+const detail = (row: any) => {
+  $router.push({
+    path: `/${$props.equipmentType === '1' ? 'info' : 'special'}/detail`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+      equipmentType: $props.equipmentType,
+    },
+  })
+}
 // 删除
 const delHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除设备信息码?',
+    `确认删除${$props.statusName === '全部' ? '此设备' : '此记录'}设吗?`,
     '确认',
     {
       confirmButtonText: '确认',
@@ -219,16 +242,18 @@
       type: 'warning',
     },
   ).then(() => {
+    // 分删除设备和删除记录
     deleteInfo({ id: row.id }).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      // close()
+      search()
     })
   })
 }
 // 取消
 const canHandler = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除设备信息码?',
+    '确认取消此申请吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -236,12 +261,36 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelInfo({ id: row.id }).then((res) => {
+    console.log(row, 'row.processInstanceIdrow.processInstanceId')
+    cancelInfo({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
       ElMessage.success('操作成功')
-      close()
+      // close()
+      search()
     })
   })
 }
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: row.id, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
 // 切换表格标识   true:普通表格  false:聚合表格
 const tableFlage = ref(true)
 const changeTable = () => {
@@ -265,10 +314,20 @@
   deep: true,
   // immediate: true,
 })
+const permUrl = ref({
+  edit: '/tested/device/info/edit',
+  del: '/tested/device/info/delete',
+  submit: '/tested/device/info/submit',
+  cancel: '/tested/device/info/cancel',
+  agree: '/tested/device/info/agree',
+  reject: '/tested/device/info/reject',
+})
 </script>
 
 <template>
   <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -282,7 +341,7 @@
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="管理状态" clearable>
-          <el-option v-for="item in []" :key="item.value" :label="item.name" :value="item.value" />
+          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
@@ -329,19 +388,43 @@
                 {{ scope.row[column.value] }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="140" align="center">
+          <el-table-column label="操作" width="160" align="center">
             <template #default=" scope ">
-              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
                 查看
               </el-button>
               <el-button
-                v-if=" editTextBtn($props.statusName) " link type="primary" size="small"
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
                 @click="handler(scope.row, 'update')"
               >
                 编辑
               </el-button>
               <el-button
-                v-if=" delTextBtn($props.statusName) " link type="danger" size="small"
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
diff --git a/src/views/tested/device/info/components/reportTable.vue b/src/views/tested/device/info/components/reportTable.vue
new file mode 100644
index 0000000..9ea4536
--- /dev/null
+++ b/src/views/tested/device/info/components/reportTable.vue
@@ -0,0 +1,164 @@
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+  status: {
+    type: String,
+    required: true,
+  },
+})
+const dialogStatus = ref('update') // 对话框类型：create,update
+// 表头显示标题
+const columns = ref([
+  {
+    text: '证书编号',
+    value: 'name',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书名称',
+    value: 'information',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '校准(检定)单位',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书日期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书有效期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '证书附件',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref([])
+// 检查数据列表
+function checkCertificateList() {
+  for (let index = 0; index < list.value.length; index++) {
+    const item = list.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (dialogStatus.value == 'detail') {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  // certificateRef.value.initDialog({ title: '添加' })
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      name: '',
+      information: '',
+      location: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+const initDialog = () => {
+  list.value = $props.data
+  dialogStatus.value = $props.status
+}
+initDialog()
+defineExpose({
+  list,
+})
+</script>
+
+<template>
+  <detail-block-switch title="证书报告">
+    <template v-if="dialogStatus !== 'detail'" #btns>
+      <el-button type="primary">
+        扫描增加
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="dialogStatus !== 'detail'" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/info/components/roamTable.vue b/src/views/tested/device/info/components/roamTable.vue
new file mode 100644
index 0000000..3d7e8fb
--- /dev/null
+++ b/src/views/tested/device/info/components/roamTable.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+  status: {
+    type: String,
+    required: true,
+  },
+})
+const dialogStatus = ref('update') // 对话框类型：create,update
+// 表头显示标题
+const columns = ref([
+  {
+    text: '使用部门',
+    value: 'name',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '使用岗位',
+    value: 'information',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '负责人',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '记录日期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref([])
+// 检查数据列表
+function checkCertificateList() {
+  for (let index = 0; index < list.value.length; index++) {
+    const item = list.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (dialogStatus.value == 'detail') {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  // certificateRef.value.initDialog({ title: '添加' })
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      name: '',
+      information: '',
+      location: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+const initDialog = () => {
+  list.value = $props.data
+  dialogStatus.value = $props.status
+}
+initDialog()
+defineExpose({
+  list,
+})
+</script>
+
+<template>
+  <detail-block-switch title="设备流转日志">
+    <template v-if="dialogStatus !== 'detail'" #btns>
+      <el-button type="primary">
+        扫描增加
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="dialogStatus !== 'detail'" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 6f4faf8..b90aa12 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -27,7 +27,7 @@
         url: '',
       }
     })
-    urlList.value.value.forEach((item) => {
+    urlList.value.forEach((item) => {
       getPhotoUrl(item.minioFileName).then((res) => {
         item.url = res.data
       })
diff --git a/src/views/tested/device/info/components/statusTable.vue b/src/views/tested/device/info/components/statusTable.vue
new file mode 100644
index 0000000..6ed89b2
--- /dev/null
+++ b/src/views/tested/device/info/components/statusTable.vue
@@ -0,0 +1,158 @@
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+  status: {
+    type: String,
+    required: true,
+  },
+})
+const dialogStatus = ref('update') // 对话框类型：create,update
+// 表头显示标题
+const columns = ref([
+  {
+    text: '状态变更类型',
+    value: 'name',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '开始日期',
+    value: 'information',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '结束日期',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '申请人',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '原因',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref([])
+// 检查数据列表
+function checkCertificateList() {
+  for (let index = 0; index < list.value.length; index++) {
+    const item = list.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (dialogStatus.value == 'detail') {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  // certificateRef.value.initDialog({ title: '添加' })
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      name: '',
+      information: '',
+      location: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+const initDialog = () => {
+  list.value = $props.data
+  dialogStatus.value = $props.status
+}
+initDialog()
+defineExpose({
+  list,
+})
+</script>
+
+<template>
+  <detail-block-switch title="状态变更记录">
+    <template v-if="dialogStatus !== 'detail'" #btns>
+      <el-button type="primary">
+        扫描增加
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="dialogStatus !== 'detail'" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>