diff --git a/public/config/config.json b/public/config/config.json
index 764d6ef..e27644a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -16,6 +16,8 @@
     "sbqfsq":"/unsealpage/detail",
     "sbfcsq":"/sealpage/detail",
     "sbbfsq":"/scrappage/detail",
+    "jlywwtfyjdjb":"/opinion/detail",
+    "rwdgl":"/meteringtask/detail",
     "检定通知":"/meteringtask/detail",
     "单位通知":"/noticelist/list",
     "溯源公示":"/noticelist/list",

diff --git a/public/config/config.json b/public/config/config.json
index 764d6ef..e27644a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -16,6 +16,8 @@
     "sbqfsq":"/unsealpage/detail",
     "sbfcsq":"/sealpage/detail",
     "sbbfsq":"/scrappage/detail",
+    "jlywwtfyjdjb":"/opinion/detail",
+    "rwdgl":"/meteringtask/detail",
     "检定通知":"/meteringtask/detail",
     "单位通知":"/noticelist/list",
     "溯源公示":"/noticelist/list",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 45de01f..bee76e1 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -79,3 +79,10 @@
     data,
   })
 }
+export function detailOpinion(params: object) {
+  return request({
+    url: '/resource/customer/suggestForm/detail',
+    method: 'get',
+    params,
+  })
+}

diff --git a/public/config/config.json b/public/config/config.json
index 764d6ef..e27644a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -16,6 +16,8 @@
     "sbqfsq":"/unsealpage/detail",
     "sbfcsq":"/sealpage/detail",
     "sbbfsq":"/scrappage/detail",
+    "jlywwtfyjdjb":"/opinion/detail",
+    "rwdgl":"/meteringtask/detail",
     "检定通知":"/meteringtask/detail",
     "单位通知":"/noticelist/list",
     "溯源公示":"/noticelist/list",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 45de01f..bee76e1 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -79,3 +79,10 @@
     data,
   })
 }
+export function detailOpinion(params: object) {
+  return request({
+    url: '/resource/customer/suggestForm/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 24c256c..67a35fb 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -1,4 +1,4 @@
-import request from '../index'
+// import request from '../index'
 import request1 from '../request'
 const prefix = 'sys'
 // const baseURL = window.localStorage.getItem('baseUrlAccount')!
@@ -22,8 +22,8 @@
 }
 // 组织查询 -- 无权限
 export function getDeptTree(params: object) {
-  return request({
-    url: '/system/deptTree',
+  return request1({
+    url: '/system/dept/listPage',
     method: 'get',
     params,
   })

diff --git a/public/config/config.json b/public/config/config.json
index 764d6ef..e27644a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -16,6 +16,8 @@
     "sbqfsq":"/unsealpage/detail",
     "sbfcsq":"/sealpage/detail",
     "sbbfsq":"/scrappage/detail",
+    "jlywwtfyjdjb":"/opinion/detail",
+    "rwdgl":"/meteringtask/detail",
     "检定通知":"/meteringtask/detail",
     "单位通知":"/noticelist/list",
     "溯源公示":"/noticelist/list",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 45de01f..bee76e1 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -79,3 +79,10 @@
     data,
   })
 }
+export function detailOpinion(params: object) {
+  return request({
+    url: '/resource/customer/suggestForm/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 24c256c..67a35fb 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -1,4 +1,4 @@
-import request from '../index'
+// import request from '../index'
 import request1 from '../request'
 const prefix = 'sys'
 // const baseURL = window.localStorage.getItem('baseUrlAccount')!
@@ -22,8 +22,8 @@
 }
 // 组织查询 -- 无权限
 export function getDeptTree(params: object) {
-  return request({
-    url: '/system/deptTree',
+  return request1({
+    url: '/system/dept/listPage',
     method: 'get',
     params,
   })
diff --git a/src/layouts/components/Tools/userInfo.vue b/src/layouts/components/Tools/userInfo.vue
index 766c109..3458e8f 100644
--- a/src/layouts/components/Tools/userInfo.vue
+++ b/src/layouts/components/Tools/userInfo.vue
@@ -7,6 +7,8 @@
 import { getInfo } from '@/api/system/login'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { clearSymbol } from '@/utils/String'
 const dialogFormVisible = ref<boolean>(false) // 对话框是否显示
 const dataFormRef = ref<FormInstance>()
 // 表单对象
@@ -23,6 +25,7 @@
   id: '',
   roleId: '',
   deptId: '',
+  deptAllName: '',
 })
 const userStore = useUserStore()
 const isEdit = ref(false)
@@ -53,12 +56,34 @@
   userForm.value.email = data.email
   userForm.value.phone = data.phone
   userForm.value.avatar = data.avatar
+  userForm.value.deptAllName = ''
   userForm.value.id = data.id
   dialogFormVisible.value = true
   resetForm()
   nextTick(() => {
     dataFormRef.value?.clearValidate()
   })
+  // 查询用户组织
+  getDeptList({ deptName: data.deptName }).then((res) => {
+    let fullDeptName = ''
+    if (res.data.list.length) {
+      getDeptTree({ limit: 999999, offset: 1 }).then((res) => {
+        const all = res.data.list
+        const depts = res.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item))
+        if (!depts.length) {
+          userForm.value.deptAllName = data.deptName
+          return
+        }
+        depts.forEach((citem: any) => {
+          const data = all.filter((item: any) => item.deptId === citem)
+          if (data.length) {
+            fullDeptName = `${fullDeptName}${data[0].fullName === '顶级' ? '' : '/'}${data[0].fullName}`
+          }
+        })
+        userForm.value.deptAllName = `${fullDeptName}/${data.deptName}`
+      })
+    }
+  })
 }
 
 defineExpose({ initDialog })
@@ -97,7 +122,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="修改密码" width="50%" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="个人信息" width="50%" append-to-body>
     <div class="btn-handler">
       <el-button v-if="!isEdit" type="primary" @click="updateDate">
         编辑
@@ -106,7 +131,7 @@
         取消
       </el-button>
     </div>
-    <el-form ref="dataFormRef" :rules="rules" :model="userForm" label-position="right" label-width="110px">
+    <el-form ref="dataFormRef" :class="[!isEdit ? 'isDetail' : '']" :rules="rules" :model="userForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
@@ -146,7 +171,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <el-input v-model="userForm.deptName" type="text" placeholder="无" disabled />
+            <el-input v-model="userForm.deptAllName" type="text" placeholder="无" disabled />
             <!-- <dept-select v-model="userForm.deptId" :data="deptTreeList" placeholder="选择组织机构" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -194,6 +219,17 @@
 </template>
 
 <style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .footer {
   display: flex;
   justify-content: flex-end;

diff --git a/public/config/config.json b/public/config/config.json
index 764d6ef..e27644a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -16,6 +16,8 @@
     "sbqfsq":"/unsealpage/detail",
     "sbfcsq":"/sealpage/detail",
     "sbbfsq":"/scrappage/detail",
+    "jlywwtfyjdjb":"/opinion/detail",
+    "rwdgl":"/meteringtask/detail",
     "检定通知":"/meteringtask/detail",
     "单位通知":"/noticelist/list",
     "溯源公示":"/noticelist/list",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 45de01f..bee76e1 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -79,3 +79,10 @@
     data,
   })
 }
+export function detailOpinion(params: object) {
+  return request({
+    url: '/resource/customer/suggestForm/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 24c256c..67a35fb 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -1,4 +1,4 @@
-import request from '../index'
+// import request from '../index'
 import request1 from '../request'
 const prefix = 'sys'
 // const baseURL = window.localStorage.getItem('baseUrlAccount')!
@@ -22,8 +22,8 @@
 }
 // 组织查询 -- 无权限
 export function getDeptTree(params: object) {
-  return request({
-    url: '/system/deptTree',
+  return request1({
+    url: '/system/dept/listPage',
     method: 'get',
     params,
   })
diff --git a/src/layouts/components/Tools/userInfo.vue b/src/layouts/components/Tools/userInfo.vue
index 766c109..3458e8f 100644
--- a/src/layouts/components/Tools/userInfo.vue
+++ b/src/layouts/components/Tools/userInfo.vue
@@ -7,6 +7,8 @@
 import { getInfo } from '@/api/system/login'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { clearSymbol } from '@/utils/String'
 const dialogFormVisible = ref<boolean>(false) // 对话框是否显示
 const dataFormRef = ref<FormInstance>()
 // 表单对象
@@ -23,6 +25,7 @@
   id: '',
   roleId: '',
   deptId: '',
+  deptAllName: '',
 })
 const userStore = useUserStore()
 const isEdit = ref(false)
@@ -53,12 +56,34 @@
   userForm.value.email = data.email
   userForm.value.phone = data.phone
   userForm.value.avatar = data.avatar
+  userForm.value.deptAllName = ''
   userForm.value.id = data.id
   dialogFormVisible.value = true
   resetForm()
   nextTick(() => {
     dataFormRef.value?.clearValidate()
   })
+  // 查询用户组织
+  getDeptList({ deptName: data.deptName }).then((res) => {
+    let fullDeptName = ''
+    if (res.data.list.length) {
+      getDeptTree({ limit: 999999, offset: 1 }).then((res) => {
+        const all = res.data.list
+        const depts = res.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item))
+        if (!depts.length) {
+          userForm.value.deptAllName = data.deptName
+          return
+        }
+        depts.forEach((citem: any) => {
+          const data = all.filter((item: any) => item.deptId === citem)
+          if (data.length) {
+            fullDeptName = `${fullDeptName}${data[0].fullName === '顶级' ? '' : '/'}${data[0].fullName}`
+          }
+        })
+        userForm.value.deptAllName = `${fullDeptName}/${data.deptName}`
+      })
+    }
+  })
 }
 
 defineExpose({ initDialog })
@@ -97,7 +122,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="修改密码" width="50%" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="个人信息" width="50%" append-to-body>
     <div class="btn-handler">
       <el-button v-if="!isEdit" type="primary" @click="updateDate">
         编辑
@@ -106,7 +131,7 @@
         取消
       </el-button>
     </div>
-    <el-form ref="dataFormRef" :rules="rules" :model="userForm" label-position="right" label-width="110px">
+    <el-form ref="dataFormRef" :class="[!isEdit ? 'isDetail' : '']" :rules="rules" :model="userForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
@@ -146,7 +171,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <el-input v-model="userForm.deptName" type="text" placeholder="无" disabled />
+            <el-input v-model="userForm.deptAllName" type="text" placeholder="无" disabled />
             <!-- <dept-select v-model="userForm.deptId" :data="deptTreeList" placeholder="选择组织机构" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -194,6 +219,17 @@
 </template>
 
 <style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .footer {
   display: flex;
   justify-content: flex-end;
diff --git a/src/utils/Array.ts b/src/utils/Array.ts
new file mode 100644
index 0000000..d7842fa
--- /dev/null
+++ b/src/utils/Array.ts
@@ -0,0 +1,48 @@
+import _ from 'lodash'
+// 常见数组操作
+
+// 两个数组求交集
+export const intersectionArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => list2.includes(v))
+}
+// 差集 -- 常用于 表格中多选删除
+export const differenceArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => !list2.includes(v))
+}
+// 补集
+export const complementaryArray = (list1: any[], list2: any[]) => {
+  return list1.filter((v) => { return !(list2.includes(v)) })
+    .concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 并集
+export const unionArray = (list1: any[], list2: any[]) => {
+  return list1.concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 一维数组去重
+export const uniqueArray = (list: any) => {
+  return [...new Set(list)]
+}
+// 二维数组根据 某一属性 去重
+export const uniqueMultiArray = (list: any, attribute: string) => {
+  const res = new Map()
+  return list.filter((a: any) => !res.has(a[attribute]) && res.set(a[attribute], 1))
+}
+// 一维数组或对象拷贝
+export const cloneArray = (data: any) => {
+  return JSON.parse(JSON.stringify(data))
+}
+// 多维数组或对象深拷贝
+export const deepClone = (data: any) => {
+  return _.cloneDeep(data)
+}
+// 数组操作-下拉框操作(已经选择的数据不能再选)
+/**
+ * @param list 下拉框初始数据(所有)
+ * @param list1 已经选择的数据
+ * @param current 当前数据 可为空
+ * @param attribute 属性(即绑定在 list1哪个属性上)
+ */
+export const setSelectList = (list: any[], list1: any[], current: string, attribute: string, attribute2 = 'value') => {
+  const select = [...new Set(list1.map((item: any) => item[attribute]))].filter((item: string) => item !== current)
+  return list.filter((item) => { return !select.includes(item[attribute2]) })
+}

diff --git a/public/config/config.json b/public/config/config.json
index 764d6ef..e27644a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -16,6 +16,8 @@
     "sbqfsq":"/unsealpage/detail",
     "sbfcsq":"/sealpage/detail",
     "sbbfsq":"/scrappage/detail",
+    "jlywwtfyjdjb":"/opinion/detail",
+    "rwdgl":"/meteringtask/detail",
     "检定通知":"/meteringtask/detail",
     "单位通知":"/noticelist/list",
     "溯源公示":"/noticelist/list",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 45de01f..bee76e1 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -79,3 +79,10 @@
     data,
   })
 }
+export function detailOpinion(params: object) {
+  return request({
+    url: '/resource/customer/suggestForm/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 24c256c..67a35fb 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -1,4 +1,4 @@
-import request from '../index'
+// import request from '../index'
 import request1 from '../request'
 const prefix = 'sys'
 // const baseURL = window.localStorage.getItem('baseUrlAccount')!
@@ -22,8 +22,8 @@
 }
 // 组织查询 -- 无权限
 export function getDeptTree(params: object) {
-  return request({
-    url: '/system/deptTree',
+  return request1({
+    url: '/system/dept/listPage',
     method: 'get',
     params,
   })
diff --git a/src/layouts/components/Tools/userInfo.vue b/src/layouts/components/Tools/userInfo.vue
index 766c109..3458e8f 100644
--- a/src/layouts/components/Tools/userInfo.vue
+++ b/src/layouts/components/Tools/userInfo.vue
@@ -7,6 +7,8 @@
 import { getInfo } from '@/api/system/login'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { clearSymbol } from '@/utils/String'
 const dialogFormVisible = ref<boolean>(false) // 对话框是否显示
 const dataFormRef = ref<FormInstance>()
 // 表单对象
@@ -23,6 +25,7 @@
   id: '',
   roleId: '',
   deptId: '',
+  deptAllName: '',
 })
 const userStore = useUserStore()
 const isEdit = ref(false)
@@ -53,12 +56,34 @@
   userForm.value.email = data.email
   userForm.value.phone = data.phone
   userForm.value.avatar = data.avatar
+  userForm.value.deptAllName = ''
   userForm.value.id = data.id
   dialogFormVisible.value = true
   resetForm()
   nextTick(() => {
     dataFormRef.value?.clearValidate()
   })
+  // 查询用户组织
+  getDeptList({ deptName: data.deptName }).then((res) => {
+    let fullDeptName = ''
+    if (res.data.list.length) {
+      getDeptTree({ limit: 999999, offset: 1 }).then((res) => {
+        const all = res.data.list
+        const depts = res.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item))
+        if (!depts.length) {
+          userForm.value.deptAllName = data.deptName
+          return
+        }
+        depts.forEach((citem: any) => {
+          const data = all.filter((item: any) => item.deptId === citem)
+          if (data.length) {
+            fullDeptName = `${fullDeptName}${data[0].fullName === '顶级' ? '' : '/'}${data[0].fullName}`
+          }
+        })
+        userForm.value.deptAllName = `${fullDeptName}/${data.deptName}`
+      })
+    }
+  })
 }
 
 defineExpose({ initDialog })
@@ -97,7 +122,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="修改密码" width="50%" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="个人信息" width="50%" append-to-body>
     <div class="btn-handler">
       <el-button v-if="!isEdit" type="primary" @click="updateDate">
         编辑
@@ -106,7 +131,7 @@
         取消
       </el-button>
     </div>
-    <el-form ref="dataFormRef" :rules="rules" :model="userForm" label-position="right" label-width="110px">
+    <el-form ref="dataFormRef" :class="[!isEdit ? 'isDetail' : '']" :rules="rules" :model="userForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
@@ -146,7 +171,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <el-input v-model="userForm.deptName" type="text" placeholder="无" disabled />
+            <el-input v-model="userForm.deptAllName" type="text" placeholder="无" disabled />
             <!-- <dept-select v-model="userForm.deptId" :data="deptTreeList" placeholder="选择组织机构" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -194,6 +219,17 @@
 </template>
 
 <style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .footer {
   display: flex;
   justify-content: flex-end;
diff --git a/src/utils/Array.ts b/src/utils/Array.ts
new file mode 100644
index 0000000..d7842fa
--- /dev/null
+++ b/src/utils/Array.ts
@@ -0,0 +1,48 @@
+import _ from 'lodash'
+// 常见数组操作
+
+// 两个数组求交集
+export const intersectionArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => list2.includes(v))
+}
+// 差集 -- 常用于 表格中多选删除
+export const differenceArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => !list2.includes(v))
+}
+// 补集
+export const complementaryArray = (list1: any[], list2: any[]) => {
+  return list1.filter((v) => { return !(list2.includes(v)) })
+    .concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 并集
+export const unionArray = (list1: any[], list2: any[]) => {
+  return list1.concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 一维数组去重
+export const uniqueArray = (list: any) => {
+  return [...new Set(list)]
+}
+// 二维数组根据 某一属性 去重
+export const uniqueMultiArray = (list: any, attribute: string) => {
+  const res = new Map()
+  return list.filter((a: any) => !res.has(a[attribute]) && res.set(a[attribute], 1))
+}
+// 一维数组或对象拷贝
+export const cloneArray = (data: any) => {
+  return JSON.parse(JSON.stringify(data))
+}
+// 多维数组或对象深拷贝
+export const deepClone = (data: any) => {
+  return _.cloneDeep(data)
+}
+// 数组操作-下拉框操作(已经选择的数据不能再选)
+/**
+ * @param list 下拉框初始数据(所有)
+ * @param list1 已经选择的数据
+ * @param current 当前数据 可为空
+ * @param attribute 属性(即绑定在 list1哪个属性上)
+ */
+export const setSelectList = (list: any[], list1: any[], current: string, attribute: string, attribute2 = 'value') => {
+  const select = [...new Set(list1.map((item: any) => item[attribute]))].filter((item: string) => item !== current)
+  return list.filter((item) => { return !select.includes(item[attribute2]) })
+}
diff --git a/src/utils/String.ts b/src/utils/String.ts
new file mode 100644
index 0000000..1f9de6f
--- /dev/null
+++ b/src/utils/String.ts
@@ -0,0 +1,10 @@
+// 字符串操作
+
+// 1.去除字符串中的特殊符号
+export const clearSymbol = (str: string) => {
+  let string = ''
+  // 替换字符串中的所有特殊字符（包含空格）
+  const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\＜\≤\＞\≥\<\>\[\]?]/g
+  string = str.replace(Exp, '')
+  return string
+}

diff --git a/public/config/config.json b/public/config/config.json
index 764d6ef..e27644a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -16,6 +16,8 @@
     "sbqfsq":"/unsealpage/detail",
     "sbfcsq":"/sealpage/detail",
     "sbbfsq":"/scrappage/detail",
+    "jlywwtfyjdjb":"/opinion/detail",
+    "rwdgl":"/meteringtask/detail",
     "检定通知":"/meteringtask/detail",
     "单位通知":"/noticelist/list",
     "溯源公示":"/noticelist/list",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 45de01f..bee76e1 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -79,3 +79,10 @@
     data,
   })
 }
+export function detailOpinion(params: object) {
+  return request({
+    url: '/resource/customer/suggestForm/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 24c256c..67a35fb 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -1,4 +1,4 @@
-import request from '../index'
+// import request from '../index'
 import request1 from '../request'
 const prefix = 'sys'
 // const baseURL = window.localStorage.getItem('baseUrlAccount')!
@@ -22,8 +22,8 @@
 }
 // 组织查询 -- 无权限
 export function getDeptTree(params: object) {
-  return request({
-    url: '/system/deptTree',
+  return request1({
+    url: '/system/dept/listPage',
     method: 'get',
     params,
   })
diff --git a/src/layouts/components/Tools/userInfo.vue b/src/layouts/components/Tools/userInfo.vue
index 766c109..3458e8f 100644
--- a/src/layouts/components/Tools/userInfo.vue
+++ b/src/layouts/components/Tools/userInfo.vue
@@ -7,6 +7,8 @@
 import { getInfo } from '@/api/system/login'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { clearSymbol } from '@/utils/String'
 const dialogFormVisible = ref<boolean>(false) // 对话框是否显示
 const dataFormRef = ref<FormInstance>()
 // 表单对象
@@ -23,6 +25,7 @@
   id: '',
   roleId: '',
   deptId: '',
+  deptAllName: '',
 })
 const userStore = useUserStore()
 const isEdit = ref(false)
@@ -53,12 +56,34 @@
   userForm.value.email = data.email
   userForm.value.phone = data.phone
   userForm.value.avatar = data.avatar
+  userForm.value.deptAllName = ''
   userForm.value.id = data.id
   dialogFormVisible.value = true
   resetForm()
   nextTick(() => {
     dataFormRef.value?.clearValidate()
   })
+  // 查询用户组织
+  getDeptList({ deptName: data.deptName }).then((res) => {
+    let fullDeptName = ''
+    if (res.data.list.length) {
+      getDeptTree({ limit: 999999, offset: 1 }).then((res) => {
+        const all = res.data.list
+        const depts = res.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item))
+        if (!depts.length) {
+          userForm.value.deptAllName = data.deptName
+          return
+        }
+        depts.forEach((citem: any) => {
+          const data = all.filter((item: any) => item.deptId === citem)
+          if (data.length) {
+            fullDeptName = `${fullDeptName}${data[0].fullName === '顶级' ? '' : '/'}${data[0].fullName}`
+          }
+        })
+        userForm.value.deptAllName = `${fullDeptName}/${data.deptName}`
+      })
+    }
+  })
 }
 
 defineExpose({ initDialog })
@@ -97,7 +122,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="修改密码" width="50%" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="个人信息" width="50%" append-to-body>
     <div class="btn-handler">
       <el-button v-if="!isEdit" type="primary" @click="updateDate">
         编辑
@@ -106,7 +131,7 @@
         取消
       </el-button>
     </div>
-    <el-form ref="dataFormRef" :rules="rules" :model="userForm" label-position="right" label-width="110px">
+    <el-form ref="dataFormRef" :class="[!isEdit ? 'isDetail' : '']" :rules="rules" :model="userForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
@@ -146,7 +171,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <el-input v-model="userForm.deptName" type="text" placeholder="无" disabled />
+            <el-input v-model="userForm.deptAllName" type="text" placeholder="无" disabled />
             <!-- <dept-select v-model="userForm.deptId" :data="deptTreeList" placeholder="选择组织机构" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -194,6 +219,17 @@
 </template>
 
 <style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .footer {
   display: flex;
   justify-content: flex-end;
diff --git a/src/utils/Array.ts b/src/utils/Array.ts
new file mode 100644
index 0000000..d7842fa
--- /dev/null
+++ b/src/utils/Array.ts
@@ -0,0 +1,48 @@
+import _ from 'lodash'
+// 常见数组操作
+
+// 两个数组求交集
+export const intersectionArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => list2.includes(v))
+}
+// 差集 -- 常用于 表格中多选删除
+export const differenceArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => !list2.includes(v))
+}
+// 补集
+export const complementaryArray = (list1: any[], list2: any[]) => {
+  return list1.filter((v) => { return !(list2.includes(v)) })
+    .concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 并集
+export const unionArray = (list1: any[], list2: any[]) => {
+  return list1.concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 一维数组去重
+export const uniqueArray = (list: any) => {
+  return [...new Set(list)]
+}
+// 二维数组根据 某一属性 去重
+export const uniqueMultiArray = (list: any, attribute: string) => {
+  const res = new Map()
+  return list.filter((a: any) => !res.has(a[attribute]) && res.set(a[attribute], 1))
+}
+// 一维数组或对象拷贝
+export const cloneArray = (data: any) => {
+  return JSON.parse(JSON.stringify(data))
+}
+// 多维数组或对象深拷贝
+export const deepClone = (data: any) => {
+  return _.cloneDeep(data)
+}
+// 数组操作-下拉框操作(已经选择的数据不能再选)
+/**
+ * @param list 下拉框初始数据(所有)
+ * @param list1 已经选择的数据
+ * @param current 当前数据 可为空
+ * @param attribute 属性(即绑定在 list1哪个属性上)
+ */
+export const setSelectList = (list: any[], list1: any[], current: string, attribute: string, attribute2 = 'value') => {
+  const select = [...new Set(list1.map((item: any) => item[attribute]))].filter((item: string) => item !== current)
+  return list.filter((item) => { return !select.includes(item[attribute2]) })
+}
diff --git a/src/utils/String.ts b/src/utils/String.ts
new file mode 100644
index 0000000..1f9de6f
--- /dev/null
+++ b/src/utils/String.ts
@@ -0,0 +1,10 @@
+// 字符串操作
+
+// 1.去除字符串中的特殊符号
+export const clearSymbol = (str: string) => {
+  let string = ''
+  // 替换字符串中的所有特殊字符（包含空格）
+  const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\＜\≤\＞\≥\<\>\[\]?]/g
+  string = str.replace(Exp, '')
+  return string
+}
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
index d9b3ef3..753ab96 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
@@ -7,7 +7,7 @@
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserDept } from '@/api/system/user'
-import { addOpinion, cancelOpinion, delOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { addOpinion, cancelOpinion, delOpinion, detailOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
 import { delTextBtn, editBtn, submitBtn } from '@/utils/applyBtns'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -57,8 +57,13 @@
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type !== 'create') {
-    const data = JSON.parse($route.query.row as string)
-    ruleForm.value = data
+    // const data = JSON.parse($route.query.row as string)
+    // console.log(data)
+    // ruleForm.value = data
+    detailOpinion({ id: $route.query.id }).then((res) => {
+      // console.log(res.data, '111')
+      ruleForm.value = res.data
+    })
   }
   if ($route.params.type === 'create') {
     ruleForm.value.formName = ''

diff --git a/public/config/config.json b/public/config/config.json
index 764d6ef..e27644a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -16,6 +16,8 @@
     "sbqfsq":"/unsealpage/detail",
     "sbfcsq":"/sealpage/detail",
     "sbbfsq":"/scrappage/detail",
+    "jlywwtfyjdjb":"/opinion/detail",
+    "rwdgl":"/meteringtask/detail",
     "检定通知":"/meteringtask/detail",
     "单位通知":"/noticelist/list",
     "溯源公示":"/noticelist/list",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 45de01f..bee76e1 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -79,3 +79,10 @@
     data,
   })
 }
+export function detailOpinion(params: object) {
+  return request({
+    url: '/resource/customer/suggestForm/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 24c256c..67a35fb 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -1,4 +1,4 @@
-import request from '../index'
+// import request from '../index'
 import request1 from '../request'
 const prefix = 'sys'
 // const baseURL = window.localStorage.getItem('baseUrlAccount')!
@@ -22,8 +22,8 @@
 }
 // 组织查询 -- 无权限
 export function getDeptTree(params: object) {
-  return request({
-    url: '/system/deptTree',
+  return request1({
+    url: '/system/dept/listPage',
     method: 'get',
     params,
   })
diff --git a/src/layouts/components/Tools/userInfo.vue b/src/layouts/components/Tools/userInfo.vue
index 766c109..3458e8f 100644
--- a/src/layouts/components/Tools/userInfo.vue
+++ b/src/layouts/components/Tools/userInfo.vue
@@ -7,6 +7,8 @@
 import { getInfo } from '@/api/system/login'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { clearSymbol } from '@/utils/String'
 const dialogFormVisible = ref<boolean>(false) // 对话框是否显示
 const dataFormRef = ref<FormInstance>()
 // 表单对象
@@ -23,6 +25,7 @@
   id: '',
   roleId: '',
   deptId: '',
+  deptAllName: '',
 })
 const userStore = useUserStore()
 const isEdit = ref(false)
@@ -53,12 +56,34 @@
   userForm.value.email = data.email
   userForm.value.phone = data.phone
   userForm.value.avatar = data.avatar
+  userForm.value.deptAllName = ''
   userForm.value.id = data.id
   dialogFormVisible.value = true
   resetForm()
   nextTick(() => {
     dataFormRef.value?.clearValidate()
   })
+  // 查询用户组织
+  getDeptList({ deptName: data.deptName }).then((res) => {
+    let fullDeptName = ''
+    if (res.data.list.length) {
+      getDeptTree({ limit: 999999, offset: 1 }).then((res) => {
+        const all = res.data.list
+        const depts = res.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item))
+        if (!depts.length) {
+          userForm.value.deptAllName = data.deptName
+          return
+        }
+        depts.forEach((citem: any) => {
+          const data = all.filter((item: any) => item.deptId === citem)
+          if (data.length) {
+            fullDeptName = `${fullDeptName}${data[0].fullName === '顶级' ? '' : '/'}${data[0].fullName}`
+          }
+        })
+        userForm.value.deptAllName = `${fullDeptName}/${data.deptName}`
+      })
+    }
+  })
 }
 
 defineExpose({ initDialog })
@@ -97,7 +122,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="修改密码" width="50%" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="个人信息" width="50%" append-to-body>
     <div class="btn-handler">
       <el-button v-if="!isEdit" type="primary" @click="updateDate">
         编辑
@@ -106,7 +131,7 @@
         取消
       </el-button>
     </div>
-    <el-form ref="dataFormRef" :rules="rules" :model="userForm" label-position="right" label-width="110px">
+    <el-form ref="dataFormRef" :class="[!isEdit ? 'isDetail' : '']" :rules="rules" :model="userForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
@@ -146,7 +171,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <el-input v-model="userForm.deptName" type="text" placeholder="无" disabled />
+            <el-input v-model="userForm.deptAllName" type="text" placeholder="无" disabled />
             <!-- <dept-select v-model="userForm.deptId" :data="deptTreeList" placeholder="选择组织机构" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -194,6 +219,17 @@
 </template>
 
 <style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .footer {
   display: flex;
   justify-content: flex-end;
diff --git a/src/utils/Array.ts b/src/utils/Array.ts
new file mode 100644
index 0000000..d7842fa
--- /dev/null
+++ b/src/utils/Array.ts
@@ -0,0 +1,48 @@
+import _ from 'lodash'
+// 常见数组操作
+
+// 两个数组求交集
+export const intersectionArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => list2.includes(v))
+}
+// 差集 -- 常用于 表格中多选删除
+export const differenceArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => !list2.includes(v))
+}
+// 补集
+export const complementaryArray = (list1: any[], list2: any[]) => {
+  return list1.filter((v) => { return !(list2.includes(v)) })
+    .concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 并集
+export const unionArray = (list1: any[], list2: any[]) => {
+  return list1.concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 一维数组去重
+export const uniqueArray = (list: any) => {
+  return [...new Set(list)]
+}
+// 二维数组根据 某一属性 去重
+export const uniqueMultiArray = (list: any, attribute: string) => {
+  const res = new Map()
+  return list.filter((a: any) => !res.has(a[attribute]) && res.set(a[attribute], 1))
+}
+// 一维数组或对象拷贝
+export const cloneArray = (data: any) => {
+  return JSON.parse(JSON.stringify(data))
+}
+// 多维数组或对象深拷贝
+export const deepClone = (data: any) => {
+  return _.cloneDeep(data)
+}
+// 数组操作-下拉框操作(已经选择的数据不能再选)
+/**
+ * @param list 下拉框初始数据(所有)
+ * @param list1 已经选择的数据
+ * @param current 当前数据 可为空
+ * @param attribute 属性(即绑定在 list1哪个属性上)
+ */
+export const setSelectList = (list: any[], list1: any[], current: string, attribute: string, attribute2 = 'value') => {
+  const select = [...new Set(list1.map((item: any) => item[attribute]))].filter((item: string) => item !== current)
+  return list.filter((item) => { return !select.includes(item[attribute2]) })
+}
diff --git a/src/utils/String.ts b/src/utils/String.ts
new file mode 100644
index 0000000..1f9de6f
--- /dev/null
+++ b/src/utils/String.ts
@@ -0,0 +1,10 @@
+// 字符串操作
+
+// 1.去除字符串中的特殊符号
+export const clearSymbol = (str: string) => {
+  let string = ''
+  // 替换字符串中的所有特殊字符（包含空格）
+  const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\＜\≤\＞\≥\<\>\[\]?]/g
+  string = str.replace(Exp, '')
+  return string
+}
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
index d9b3ef3..753ab96 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
@@ -7,7 +7,7 @@
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserDept } from '@/api/system/user'
-import { addOpinion, cancelOpinion, delOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { addOpinion, cancelOpinion, delOpinion, detailOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
 import { delTextBtn, editBtn, submitBtn } from '@/utils/applyBtns'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -57,8 +57,13 @@
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type !== 'create') {
-    const data = JSON.parse($route.query.row as string)
-    ruleForm.value = data
+    // const data = JSON.parse($route.query.row as string)
+    // console.log(data)
+    // ruleForm.value = data
+    detailOpinion({ id: $route.query.id }).then((res) => {
+      // console.log(res.data, '111')
+      ruleForm.value = res.data
+    })
   }
   if ($route.params.type === 'create') {
     ruleForm.value.formName = ''
diff --git a/src/views/tested/dashboard/components/deviceList.vue b/src/views/tested/dashboard/components/deviceList.vue
index 6f886f1..c46ffc1 100644
--- a/src/views/tested/dashboard/components/deviceList.vue
+++ b/src/views/tested/dashboard/components/deviceList.vue
@@ -1,5 +1,7 @@
 <!-- 设备列表 -->
 <script lang="ts" setup name="Dashboard">
+import detail from '../../MeasurementPlan/plan/components/detail.vue'
+
 // import verificationDetail from './components/verificationDetail.vue'
 const width = ref(document.body.clientWidth - 180)
 const height = ref(document.body.clientHeight - 50 - 60 - 10)

diff --git a/public/config/config.json b/public/config/config.json
index 764d6ef..e27644a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -16,6 +16,8 @@
     "sbqfsq":"/unsealpage/detail",
     "sbfcsq":"/sealpage/detail",
     "sbbfsq":"/scrappage/detail",
+    "jlywwtfyjdjb":"/opinion/detail",
+    "rwdgl":"/meteringtask/detail",
     "检定通知":"/meteringtask/detail",
     "单位通知":"/noticelist/list",
     "溯源公示":"/noticelist/list",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 45de01f..bee76e1 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -79,3 +79,10 @@
     data,
   })
 }
+export function detailOpinion(params: object) {
+  return request({
+    url: '/resource/customer/suggestForm/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 24c256c..67a35fb 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -1,4 +1,4 @@
-import request from '../index'
+// import request from '../index'
 import request1 from '../request'
 const prefix = 'sys'
 // const baseURL = window.localStorage.getItem('baseUrlAccount')!
@@ -22,8 +22,8 @@
 }
 // 组织查询 -- 无权限
 export function getDeptTree(params: object) {
-  return request({
-    url: '/system/deptTree',
+  return request1({
+    url: '/system/dept/listPage',
     method: 'get',
     params,
   })
diff --git a/src/layouts/components/Tools/userInfo.vue b/src/layouts/components/Tools/userInfo.vue
index 766c109..3458e8f 100644
--- a/src/layouts/components/Tools/userInfo.vue
+++ b/src/layouts/components/Tools/userInfo.vue
@@ -7,6 +7,8 @@
 import { getInfo } from '@/api/system/login'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { clearSymbol } from '@/utils/String'
 const dialogFormVisible = ref<boolean>(false) // 对话框是否显示
 const dataFormRef = ref<FormInstance>()
 // 表单对象
@@ -23,6 +25,7 @@
   id: '',
   roleId: '',
   deptId: '',
+  deptAllName: '',
 })
 const userStore = useUserStore()
 const isEdit = ref(false)
@@ -53,12 +56,34 @@
   userForm.value.email = data.email
   userForm.value.phone = data.phone
   userForm.value.avatar = data.avatar
+  userForm.value.deptAllName = ''
   userForm.value.id = data.id
   dialogFormVisible.value = true
   resetForm()
   nextTick(() => {
     dataFormRef.value?.clearValidate()
   })
+  // 查询用户组织
+  getDeptList({ deptName: data.deptName }).then((res) => {
+    let fullDeptName = ''
+    if (res.data.list.length) {
+      getDeptTree({ limit: 999999, offset: 1 }).then((res) => {
+        const all = res.data.list
+        const depts = res.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item))
+        if (!depts.length) {
+          userForm.value.deptAllName = data.deptName
+          return
+        }
+        depts.forEach((citem: any) => {
+          const data = all.filter((item: any) => item.deptId === citem)
+          if (data.length) {
+            fullDeptName = `${fullDeptName}${data[0].fullName === '顶级' ? '' : '/'}${data[0].fullName}`
+          }
+        })
+        userForm.value.deptAllName = `${fullDeptName}/${data.deptName}`
+      })
+    }
+  })
 }
 
 defineExpose({ initDialog })
@@ -97,7 +122,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="修改密码" width="50%" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="个人信息" width="50%" append-to-body>
     <div class="btn-handler">
       <el-button v-if="!isEdit" type="primary" @click="updateDate">
         编辑
@@ -106,7 +131,7 @@
         取消
       </el-button>
     </div>
-    <el-form ref="dataFormRef" :rules="rules" :model="userForm" label-position="right" label-width="110px">
+    <el-form ref="dataFormRef" :class="[!isEdit ? 'isDetail' : '']" :rules="rules" :model="userForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
@@ -146,7 +171,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <el-input v-model="userForm.deptName" type="text" placeholder="无" disabled />
+            <el-input v-model="userForm.deptAllName" type="text" placeholder="无" disabled />
             <!-- <dept-select v-model="userForm.deptId" :data="deptTreeList" placeholder="选择组织机构" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -194,6 +219,17 @@
 </template>
 
 <style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .footer {
   display: flex;
   justify-content: flex-end;
diff --git a/src/utils/Array.ts b/src/utils/Array.ts
new file mode 100644
index 0000000..d7842fa
--- /dev/null
+++ b/src/utils/Array.ts
@@ -0,0 +1,48 @@
+import _ from 'lodash'
+// 常见数组操作
+
+// 两个数组求交集
+export const intersectionArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => list2.includes(v))
+}
+// 差集 -- 常用于 表格中多选删除
+export const differenceArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => !list2.includes(v))
+}
+// 补集
+export const complementaryArray = (list1: any[], list2: any[]) => {
+  return list1.filter((v) => { return !(list2.includes(v)) })
+    .concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 并集
+export const unionArray = (list1: any[], list2: any[]) => {
+  return list1.concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 一维数组去重
+export const uniqueArray = (list: any) => {
+  return [...new Set(list)]
+}
+// 二维数组根据 某一属性 去重
+export const uniqueMultiArray = (list: any, attribute: string) => {
+  const res = new Map()
+  return list.filter((a: any) => !res.has(a[attribute]) && res.set(a[attribute], 1))
+}
+// 一维数组或对象拷贝
+export const cloneArray = (data: any) => {
+  return JSON.parse(JSON.stringify(data))
+}
+// 多维数组或对象深拷贝
+export const deepClone = (data: any) => {
+  return _.cloneDeep(data)
+}
+// 数组操作-下拉框操作(已经选择的数据不能再选)
+/**
+ * @param list 下拉框初始数据(所有)
+ * @param list1 已经选择的数据
+ * @param current 当前数据 可为空
+ * @param attribute 属性(即绑定在 list1哪个属性上)
+ */
+export const setSelectList = (list: any[], list1: any[], current: string, attribute: string, attribute2 = 'value') => {
+  const select = [...new Set(list1.map((item: any) => item[attribute]))].filter((item: string) => item !== current)
+  return list.filter((item) => { return !select.includes(item[attribute2]) })
+}
diff --git a/src/utils/String.ts b/src/utils/String.ts
new file mode 100644
index 0000000..1f9de6f
--- /dev/null
+++ b/src/utils/String.ts
@@ -0,0 +1,10 @@
+// 字符串操作
+
+// 1.去除字符串中的特殊符号
+export const clearSymbol = (str: string) => {
+  let string = ''
+  // 替换字符串中的所有特殊字符（包含空格）
+  const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\＜\≤\＞\≥\<\>\[\]?]/g
+  string = str.replace(Exp, '')
+  return string
+}
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
index d9b3ef3..753ab96 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
@@ -7,7 +7,7 @@
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserDept } from '@/api/system/user'
-import { addOpinion, cancelOpinion, delOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { addOpinion, cancelOpinion, delOpinion, detailOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
 import { delTextBtn, editBtn, submitBtn } from '@/utils/applyBtns'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -57,8 +57,13 @@
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type !== 'create') {
-    const data = JSON.parse($route.query.row as string)
-    ruleForm.value = data
+    // const data = JSON.parse($route.query.row as string)
+    // console.log(data)
+    // ruleForm.value = data
+    detailOpinion({ id: $route.query.id }).then((res) => {
+      // console.log(res.data, '111')
+      ruleForm.value = res.data
+    })
   }
   if ($route.params.type === 'create') {
     ruleForm.value.formName = ''
diff --git a/src/views/tested/dashboard/components/deviceList.vue b/src/views/tested/dashboard/components/deviceList.vue
index 6f886f1..c46ffc1 100644
--- a/src/views/tested/dashboard/components/deviceList.vue
+++ b/src/views/tested/dashboard/components/deviceList.vue
@@ -1,5 +1,7 @@
 <!-- 设备列表 -->
 <script lang="ts" setup name="Dashboard">
+import detail from '../../MeasurementPlan/plan/components/detail.vue'
+
 // import verificationDetail from './components/verificationDetail.vue'
 const width = ref(document.body.clientWidth - 180)
 const height = ref(document.body.clientHeight - 50 - 60 - 10)
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 8c16018..3b3276f 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -123,7 +123,7 @@
       query: {
         row: JSON.stringify({ id: row.bizId, equipmentId: row.bizId }),
         id: row.bizId,
-        statusName: '审批',
+        statusName: '全部',
       },
     })
   }

diff --git a/public/config/config.json b/public/config/config.json
index 764d6ef..e27644a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -16,6 +16,8 @@
     "sbqfsq":"/unsealpage/detail",
     "sbfcsq":"/sealpage/detail",
     "sbbfsq":"/scrappage/detail",
+    "jlywwtfyjdjb":"/opinion/detail",
+    "rwdgl":"/meteringtask/detail",
     "检定通知":"/meteringtask/detail",
     "单位通知":"/noticelist/list",
     "溯源公示":"/noticelist/list",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 45de01f..bee76e1 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -79,3 +79,10 @@
     data,
   })
 }
+export function detailOpinion(params: object) {
+  return request({
+    url: '/resource/customer/suggestForm/detail',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 24c256c..67a35fb 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -1,4 +1,4 @@
-import request from '../index'
+// import request from '../index'
 import request1 from '../request'
 const prefix = 'sys'
 // const baseURL = window.localStorage.getItem('baseUrlAccount')!
@@ -22,8 +22,8 @@
 }
 // 组织查询 -- 无权限
 export function getDeptTree(params: object) {
-  return request({
-    url: '/system/deptTree',
+  return request1({
+    url: '/system/dept/listPage',
     method: 'get',
     params,
   })
diff --git a/src/layouts/components/Tools/userInfo.vue b/src/layouts/components/Tools/userInfo.vue
index 766c109..3458e8f 100644
--- a/src/layouts/components/Tools/userInfo.vue
+++ b/src/layouts/components/Tools/userInfo.vue
@@ -7,6 +7,8 @@
 import { getInfo } from '@/api/system/login'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { clearSymbol } from '@/utils/String'
 const dialogFormVisible = ref<boolean>(false) // 对话框是否显示
 const dataFormRef = ref<FormInstance>()
 // 表单对象
@@ -23,6 +25,7 @@
   id: '',
   roleId: '',
   deptId: '',
+  deptAllName: '',
 })
 const userStore = useUserStore()
 const isEdit = ref(false)
@@ -53,12 +56,34 @@
   userForm.value.email = data.email
   userForm.value.phone = data.phone
   userForm.value.avatar = data.avatar
+  userForm.value.deptAllName = ''
   userForm.value.id = data.id
   dialogFormVisible.value = true
   resetForm()
   nextTick(() => {
     dataFormRef.value?.clearValidate()
   })
+  // 查询用户组织
+  getDeptList({ deptName: data.deptName }).then((res) => {
+    let fullDeptName = ''
+    if (res.data.list.length) {
+      getDeptTree({ limit: 999999, offset: 1 }).then((res) => {
+        const all = res.data.list
+        const depts = res.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item))
+        if (!depts.length) {
+          userForm.value.deptAllName = data.deptName
+          return
+        }
+        depts.forEach((citem: any) => {
+          const data = all.filter((item: any) => item.deptId === citem)
+          if (data.length) {
+            fullDeptName = `${fullDeptName}${data[0].fullName === '顶级' ? '' : '/'}${data[0].fullName}`
+          }
+        })
+        userForm.value.deptAllName = `${fullDeptName}/${data.deptName}`
+      })
+    }
+  })
 }
 
 defineExpose({ initDialog })
@@ -97,7 +122,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="修改密码" width="50%" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="个人信息" width="50%" append-to-body>
     <div class="btn-handler">
       <el-button v-if="!isEdit" type="primary" @click="updateDate">
         编辑
@@ -106,7 +131,7 @@
         取消
       </el-button>
     </div>
-    <el-form ref="dataFormRef" :rules="rules" :model="userForm" label-position="right" label-width="110px">
+    <el-form ref="dataFormRef" :class="[!isEdit ? 'isDetail' : '']" :rules="rules" :model="userForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
@@ -146,7 +171,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <el-input v-model="userForm.deptName" type="text" placeholder="无" disabled />
+            <el-input v-model="userForm.deptAllName" type="text" placeholder="无" disabled />
             <!-- <dept-select v-model="userForm.deptId" :data="deptTreeList" placeholder="选择组织机构" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -194,6 +219,17 @@
 </template>
 
 <style lang="scss" scoped>
+// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .footer {
   display: flex;
   justify-content: flex-end;
diff --git a/src/utils/Array.ts b/src/utils/Array.ts
new file mode 100644
index 0000000..d7842fa
--- /dev/null
+++ b/src/utils/Array.ts
@@ -0,0 +1,48 @@
+import _ from 'lodash'
+// 常见数组操作
+
+// 两个数组求交集
+export const intersectionArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => list2.includes(v))
+}
+// 差集 -- 常用于 表格中多选删除
+export const differenceArray = (list1: any[], list2: any[]) => {
+  return list1.filter(v => !list2.includes(v))
+}
+// 补集
+export const complementaryArray = (list1: any[], list2: any[]) => {
+  return list1.filter((v) => { return !(list2.includes(v)) })
+    .concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 并集
+export const unionArray = (list1: any[], list2: any[]) => {
+  return list1.concat(list2.filter((v) => { return !(list1.includes(v)) }))
+}
+// 一维数组去重
+export const uniqueArray = (list: any) => {
+  return [...new Set(list)]
+}
+// 二维数组根据 某一属性 去重
+export const uniqueMultiArray = (list: any, attribute: string) => {
+  const res = new Map()
+  return list.filter((a: any) => !res.has(a[attribute]) && res.set(a[attribute], 1))
+}
+// 一维数组或对象拷贝
+export const cloneArray = (data: any) => {
+  return JSON.parse(JSON.stringify(data))
+}
+// 多维数组或对象深拷贝
+export const deepClone = (data: any) => {
+  return _.cloneDeep(data)
+}
+// 数组操作-下拉框操作(已经选择的数据不能再选)
+/**
+ * @param list 下拉框初始数据(所有)
+ * @param list1 已经选择的数据
+ * @param current 当前数据 可为空
+ * @param attribute 属性(即绑定在 list1哪个属性上)
+ */
+export const setSelectList = (list: any[], list1: any[], current: string, attribute: string, attribute2 = 'value') => {
+  const select = [...new Set(list1.map((item: any) => item[attribute]))].filter((item: string) => item !== current)
+  return list.filter((item) => { return !select.includes(item[attribute2]) })
+}
diff --git a/src/utils/String.ts b/src/utils/String.ts
new file mode 100644
index 0000000..1f9de6f
--- /dev/null
+++ b/src/utils/String.ts
@@ -0,0 +1,10 @@
+// 字符串操作
+
+// 1.去除字符串中的特殊符号
+export const clearSymbol = (str: string) => {
+  let string = ''
+  // 替换字符串中的所有特殊字符（包含空格）
+  const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\＜\≤\＞\≥\<\>\[\]?]/g
+  string = str.replace(Exp, '')
+  return string
+}
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
index d9b3ef3..753ab96 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
@@ -7,7 +7,7 @@
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import { getUserDept } from '@/api/system/user'
-import { addOpinion, cancelOpinion, delOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { addOpinion, cancelOpinion, delOpinion, detailOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
 import { delTextBtn, editBtn, submitBtn } from '@/utils/applyBtns'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -57,8 +57,13 @@
   dialogStatus.value = $route.params.type as string
   ruleFormRef.value?.resetFields()
   if ($route.params.type !== 'create') {
-    const data = JSON.parse($route.query.row as string)
-    ruleForm.value = data
+    // const data = JSON.parse($route.query.row as string)
+    // console.log(data)
+    // ruleForm.value = data
+    detailOpinion({ id: $route.query.id }).then((res) => {
+      // console.log(res.data, '111')
+      ruleForm.value = res.data
+    })
   }
   if ($route.params.type === 'create') {
     ruleForm.value.formName = ''
diff --git a/src/views/tested/dashboard/components/deviceList.vue b/src/views/tested/dashboard/components/deviceList.vue
index 6f886f1..c46ffc1 100644
--- a/src/views/tested/dashboard/components/deviceList.vue
+++ b/src/views/tested/dashboard/components/deviceList.vue
@@ -1,5 +1,7 @@
 <!-- 设备列表 -->
 <script lang="ts" setup name="Dashboard">
+import detail from '../../MeasurementPlan/plan/components/detail.vue'
+
 // import verificationDetail from './components/verificationDetail.vue'
 const width = ref(document.body.clientWidth - 180)
 const height = ref(document.body.clientHeight - 50 - 60 - 10)
diff --git a/src/views/tested/dashboard/components/list.vue b/src/views/tested/dashboard/components/list.vue
index 8c16018..3b3276f 100644
--- a/src/views/tested/dashboard/components/list.vue
+++ b/src/views/tested/dashboard/components/list.vue
@@ -123,7 +123,7 @@
       query: {
         row: JSON.stringify({ id: row.bizId, equipmentId: row.bizId }),
         id: row.bizId,
-        statusName: '审批',
+        statusName: '全部',
       },
     })
   }
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index d1e163b..6407121 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -1,7 +1,7 @@
 <!-- 列表组件 -->
 <script lang="ts" setup name="TableList">
 import { ElMessage } from 'element-plus'
-import { getBoardApprove, getBoardMessage } from '@/api/eqpt/dashboard/index'
+import { getBoardApprove, getBoardMessage, setRead } from '@/api/eqpt/dashboard/index'
 const $props = defineProps({
   height: {
     type: Number,
@@ -57,12 +57,12 @@
       query: {
         row: JSON.stringify({ id: row.bizId, equipmentId: row.bizId }),
         id: row.bizId,
-        statusName: '审批',
+        statusName: '全部',
       },
     })
   }
-  // console.log(row, '111')
-  if (row.messageType || row.messageModule) {
+  if (row.messageModule !== '审批提醒') {
+    setRead(row)
     if (window.$pathDict[row.messageType]) {
       if (row.messageModule.includes('tzsb')) {
         nav('/speciallist/detail')
@@ -80,7 +80,7 @@
       }
     }
   }
-  else if (row.formId) {
+  else {
     if (row.formId === 'sbtzgl' && row.messageTopic.includes('tzsb')) {
       $router.push({
         path: '/speciallist/detail',
@@ -109,9 +109,6 @@
       })
     }
   }
-  else {
-    ElMessage.warning('暂无详情')
-  }
 }
 </script>